Merge remote-tracking branch 'modem-shm/for-next'

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

Tue, 17 Apr 2012 03:18:47 +0000 (13:18 +1000)

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

Tue, 17 Apr 2012 03:18:47 +0000 (13:18 +1000)
author Stephen Rothwell <sfr@canb.auug.org.au>
Tue, 17 Apr 2012 03:18:47 +0000 (13:18 +1000)
committer Stephen Rothwell <sfr@canb.auug.org.au>
Tue, 17 Apr 2012 03:18:47 +0000 (13:18 +1000)
diff --cc drivers/Kconfig
Simple merge
diff --cc drivers/Makefile
Simple merge
diff --cc include/linux/Kbuild
Simple merge
author	Stephen Rothwell <sfr@canb.auug.org.au>
	Tue, 17 Apr 2012 03:18:47 +0000 (13:18 +1000)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Tue, 17 Apr 2012 03:18:47 +0000 (13:18 +1000)
		1	2
drivers/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
include/linux/Kbuild	patch \|	diff1 \|	diff2 \|	blob \| history