The following commit has been merged in the linux branch: commit ed9666d30f0e07f5c58eaf8deb01c87150f03f6a Merge: 91ca358ef3b5e5f0ba3b4bddb0acb0fa6d7b9b80 7c9abfb884b8737f0afdc8a88bcea77526f0da87 Author: Andrew Lunn lunn@lunn.ch Date: Sun Nov 8 19:33:36 2009 +0100

Merge remote branch 'torvalds/master'; commit 'v2.6.32-rc6' into linux

diff --combined drivers/staging/Kconfig index af20aea,d21b346..fc1c1aa --- a/drivers/staging/Kconfig +++ b/drivers/staging/Kconfig @@@ -93,8 -93,6 +93,6 @@@ source "drivers/staging/dst/Kconfig

source "drivers/staging/pohmelfs/Kconfig"

- source "drivers/staging/stlc45xx/Kconfig" - source "drivers/staging/b3dfg/Kconfig"

source "drivers/staging/phison/Kconfig" @@@ -127,7 -125,5 +125,7 @@@ source "drivers/staging/sep/Kconfig

source "drivers/staging/iio/Kconfig"

+source "drivers/staging/batman-adv/Kconfig" + endif # !STAGING_EXCLUDE_BUILD endif # STAGING diff --combined drivers/staging/Makefile index f736a74,8cbf1ae..190748c --- a/drivers/staging/Makefile +++ b/drivers/staging/Makefile @@@ -29,7 -29,6 +29,6 @@@ obj-$(CONFIG_ANDROID) += android obj-$(CONFIG_ANDROID) += dream/ obj-$(CONFIG_DST) += dst/ obj-$(CONFIG_POHMELFS) += pohmelfs/ - obj-$(CONFIG_STLC45XX) += stlc45xx/ obj-$(CONFIG_B3DFG) += b3dfg/ obj-$(CONFIG_IDE_PHISON) += phison/ obj-$(CONFIG_PLAN9AUTH) += p9auth/ @@@ -45,4 -44,3 +44,4 @@@ obj-$(CONFIG_VME_BUS) += vme obj-$(CONFIG_RAR_REGISTER) += rar/ obj-$(CONFIG_DX_SEP) += sep/ obj-$(CONFIG_IIO) += iio/ +obj-$(CONFIG_BATMAN_ADV) += batman-adv/