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

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

Fri, 23 Sep 2011 01:39:33 +0000 (11:39 +1000)

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

Fri, 23 Sep 2011 01:39:33 +0000 (11:39 +1000)
author Stephen Rothwell <sfr@canb.auug.org.au>
Fri, 23 Sep 2011 01:39:33 +0000 (11:39 +1000)
committer Stephen Rothwell <sfr@canb.auug.org.au>
Fri, 23 Sep 2011 01:39:33 +0000 (11:39 +1000)
diff --cc Makefile
Simple merge
diff --cc scripts/checkpatch.pl
Simple merge
author	Stephen Rothwell <sfr@canb.auug.org.au>
	Fri, 23 Sep 2011 01:39:33 +0000 (11:39 +1000)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Fri, 23 Sep 2011 01:39:33 +0000 (11:39 +1000)
		1	2
Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
scripts/checkpatch.pl	patch \|	diff1 \|	diff2 \|	blob \| history