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

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

Wed, 5 Sep 2012 01:15:09 +0000 (11:15 +1000)

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

Wed, 5 Sep 2012 01:15:09 +0000 (11:15 +1000)
author Stephen Rothwell <sfr@canb.auug.org.au>
Wed, 5 Sep 2012 01:15:09 +0000 (11:15 +1000)
committer Stephen Rothwell <sfr@canb.auug.org.au>
Wed, 5 Sep 2012 01:15:09 +0000 (11:15 +1000)
diff --cc MAINTAINERS
Simple merge
diff --cc Makefile
Simple merge
diff --cc scripts/kernel-doc
Simple merge
author	Stephen Rothwell <sfr@canb.auug.org.au>
	Wed, 5 Sep 2012 01:15:09 +0000 (11:15 +1000)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Wed, 5 Sep 2012 01:15:09 +0000 (11:15 +1000)
		1	2
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history
Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
scripts/kernel-doc	patch \|	diff1 \|	diff2 \|	blob \| history