git.baikalelectronics.ru Git - kernel.git/commit

]> git.baikalelectronics.ru Git - kernel.git/commit

author	Greg Kroah-Hartman <gregkh@suse.de>
	Tue, 5 Jul 2011 14:35:09 +0000 (07:35 -0700)
committer	Greg Kroah-Hartman <gregkh@suse.de>
	Tue, 5 Jul 2011 14:35:09 +0000 (07:35 -0700)
commit	591e502c43d6a3fe67d9e85a9634dd38cc018244
tree	acbab68f802fadbff85590c139c87dc199bb465d	tree \| snapshot
parent	65d0e1dd4a58d6024fe552af7ddde3c2f6f3979b	commit \| diff
parent	bc2c5ebdc8745b131d5424fb6cd893be863e819e	commit \| diff

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>

Linux Kernel Source Tree.

RSS Atom

Documentation/feature-removal-schedule.txt	diff1 \|	diff2 \|	blob \| history
MAINTAINERS	diff1 \|	diff2 \|	blob \| history
drivers/staging/iio/accel/adis16201.h	diff1 \|	diff2 \|	blob \| history
drivers/staging/iio/accel/adis16203.h	diff1 \|	diff2 \|	blob \| history
drivers/staging/iio/accel/adis16204.h	diff1 \|	diff2 \|	blob \| history
drivers/staging/iio/accel/adis16209.h	diff1 \|	diff2 \|	blob \| history
drivers/staging/iio/gyro/adis16260.h	diff1 \|	diff2 \|	blob \| history
drivers/staging/mei/init.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/mei/wd.c	diff1 \|	diff2 \|	blob \| history