Merge remote-tracking branch 'kbuild/for-next'

author Stephen Rothwell <sfr@canb.auug.org.au>

Thu, 13 Oct 2011 01:35:40 +0000 (12:35 +1100)

committer Stephen Rothwell <sfr@canb.auug.org.au>

Thu, 13 Oct 2011 01:35:40 +0000 (12:35 +1100)
author Stephen Rothwell <sfr@canb.auug.org.au>
Thu, 13 Oct 2011 01:35:40 +0000 (12:35 +1100)
committer Stephen Rothwell <sfr@canb.auug.org.au>
Thu, 13 Oct 2011 01:35:40 +0000 (12:35 +1100)
diff --cc Makefile
Simple merge
diff --cc scripts/checkpatch.pl
Simple merge
author	Stephen Rothwell <sfr@canb.auug.org.au>
	Thu, 13 Oct 2011 01:35:40 +0000 (12:35 +1100)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Thu, 13 Oct 2011 01:35:40 +0000 (12:35 +1100)
		1	2
Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
scripts/checkpatch.pl	patch \|	diff1 \|	diff2 \|	blob \| history