Merge branch 'next-s3c' of git://aeryn.fluff.org.uk/bjdooks/linux into devel

author Russell King <rmk@dyn-67.arm.linux.org.uk>

Thu, 18 Jun 2009 22:10:29 +0000 (23:10 +0100)

committer Russell King <rmk+kernel@arm.linux.org.uk>

Thu, 18 Jun 2009 22:10:29 +0000 (23:10 +0100)
author Russell King <rmk@dyn-67.arm.linux.org.uk>
Thu, 18 Jun 2009 22:10:29 +0000 (23:10 +0100)
committer Russell King <rmk+kernel@arm.linux.org.uk>
Thu, 18 Jun 2009 22:10:29 +0000 (23:10 +0100)
diff --cc Documentation/kernel-parameters.txt
Simple merge
diff --cc MAINTAINERS
Simple merge
author	Russell King <rmk@dyn-67.arm.linux.org.uk>
	Thu, 18 Jun 2009 22:10:29 +0000 (23:10 +0100)
committer	Russell King <rmk+kernel@arm.linux.org.uk>
	Thu, 18 Jun 2009 22:10:29 +0000 (23:10 +0100)
		1	2
Documentation/kernel-parameters.txt	patch \|	diff1 \|	diff2 \|	blob \| history
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history