From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Wed, 4 Oct 2006 16:59:57 +0000 (-0700)
Subject: Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/configh
X-Git-Tag: MMI-PSA29.97-13-9~46398
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=fefd26b3b8597a11a422d950c0d4424ff33a70ad;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

Merge /pub/scm/linux/kernel/git/davej/configh

* master.kernel.org:/pub/scm/linux/kernel/git/davej/configh:
  Remove all inclusions of <linux/config.h>

Manually resolved trivial path conflicts due to removed files in
the sound/oss/ subdirectory.
---

fefd26b3b8597a11a422d950c0d4424ff33a70ad