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

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

Wed, 25 Jul 2012 00:16:33 +0000 (10:16 +1000)

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

Wed, 25 Jul 2012 00:16:33 +0000 (10:16 +1000)
author Stephen Rothwell <sfr@canb.auug.org.au>
Wed, 25 Jul 2012 00:16:33 +0000 (10:16 +1000)
committer Stephen Rothwell <sfr@canb.auug.org.au>
Wed, 25 Jul 2012 00:16:33 +0000 (10:16 +1000)
diff --cc Makefile
Simple merge
diff --cc arch/tile/include/asm/Kbuild
Simple merge
author	Stephen Rothwell <sfr@canb.auug.org.au>
	Wed, 25 Jul 2012 00:16:33 +0000 (10:16 +1000)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Wed, 25 Jul 2012 00:16:33 +0000 (10:16 +1000)
		1	2
Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
arch/tile/include/asm/Kbuild	patch \|	diff1 \|	diff2 \|	blob \| history