Merge branch 'misc-2.6.33' into release

author Len Brown <[email protected]>

Thu, 24 Dec 2009 06:19:00 +0000 (01:19 -0500)

committer Len Brown <[email protected]>

Thu, 24 Dec 2009 06:19:00 +0000 (01:19 -0500)
author Len Brown <[email protected]>
Thu, 24 Dec 2009 06:19:00 +0000 (01:19 -0500)
committer Len Brown <[email protected]>
Thu, 24 Dec 2009 06:19:00 +0000 (01:19 -0500)
diff --cc MAINTAINERS
Simple merge
diff --cc drivers/platform/x86/fujitsu-laptop.c
Simple merge
author	Len Brown <[email protected]>
	Thu, 24 Dec 2009 06:19:00 +0000 (01:19 -0500)
committer	Len Brown <[email protected]>
	Thu, 24 Dec 2009 06:19:00 +0000 (01:19 -0500)
		1	2
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/platform/x86/fujitsu-laptop.c	patch \|	diff1 \|	diff2 \|	blob \| history