Merge Linux 3.0-rc6 into staging-next
authorGreg Kroah-Hartman <gregkh@suse.de>
Tue, 5 Jul 2011 14:35:09 +0000 (07:35 -0700)
committerGreg Kroah-Hartman <gregkh@suse.de>
Tue, 5 Jul 2011 14:35:09 +0000 (07:35 -0700)
This handles the merge conflicts with the
drivers/staging/brcm80211/Kconfig file due to changes on the two
different branches.

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
1  2 
Documentation/feature-removal-schedule.txt
MAINTAINERS
drivers/staging/iio/accel/adis16201.h
drivers/staging/iio/accel/adis16203.h
drivers/staging/iio/accel/adis16204.h
drivers/staging/iio/accel/adis16209.h
drivers/staging/iio/gyro/adis16260.h
drivers/staging/mei/init.c
drivers/staging/mei/wd.c

diff --cc MAINTAINERS
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge