Merge branch 'misc' into release

author Len Brown <len.brown@intel.com>

Wed, 12 Nov 2008 02:14:11 +0000 (21:14 -0500)

committer Len Brown <len.brown@intel.com>

Wed, 12 Nov 2008 02:14:11 +0000 (21:14 -0500)
author Len Brown <len.brown@intel.com>
Wed, 12 Nov 2008 02:14:11 +0000 (21:14 -0500)
committer Len Brown <len.brown@intel.com>
Wed, 12 Nov 2008 02:14:11 +0000 (21:14 -0500)
diff --cc Documentation/kernel-parameters.txt
Simple merge
diff --cc MAINTAINERS
Simple merge
diff --cc drivers/char/sonypi.c
Simple merge
author	Len Brown <len.brown@intel.com>
	Wed, 12 Nov 2008 02:14:11 +0000 (21:14 -0500)
committer	Len Brown <len.brown@intel.com>
	Wed, 12 Nov 2008 02:14:11 +0000 (21:14 -0500)
		1	2
Documentation/kernel-parameters.txt	patch \|	diff1 \|	diff2 \|	blob \| history
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/char/sonypi.c	patch \|	diff1 \|	diff2 \|	blob \| history