Merge Linux 3.0-rc6 into staging-next

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>

diff --cc Documentation/feature-removal-schedule.txt
Simple merge

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/staging/iio/accel/adis16201.h
Simple merge

diff --cc drivers/staging/iio/accel/adis16203.h
Simple merge

diff --cc drivers/staging/iio/accel/adis16204.h
Simple merge

diff --cc drivers/staging/iio/accel/adis16209.h
Simple merge

diff --cc drivers/staging/iio/gyro/adis16260.h
Simple merge

diff --cc drivers/staging/mei/init.c
Simple merge

diff --cc drivers/staging/mei/wd.c
Simple merge