Public Git Hosting - linux-2.6/linux-acpi-2.6/ibm-acpi-2.6.git/commit

commit	0c9e98af5e94877ad3b1af2c0f39b2376a462ded
author	Greg Kroah-Hartman <gregkh@suse.de>
	Tue, 5 Jul 2011 14:35:09 +0000 (5 07:35 -0700)
committer	Greg Kroah-Hartman <gregkh@suse.de>
	Tue, 5 Jul 2011 14:35:09 +0000 (5 07:35 -0700)
tree	acbab68f802fadbff85590c139c87dc199bb465d	tree \| snapshot (tar.gz zip)
parent	af0c25c4876305dfa1a25ac1cc92d3cddfa476a6	commit \| diff
parent	fe0d42203cb5616eeff68b14576a0f7e2dd56625	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 2.6 ibm-acpi/thinkpad-acpi driver git 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