Merge remote-tracking branch 'modules/modules-next'

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

Wed, 20 Feb 2013 02:33:39 +0000 (13:33 +1100)

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

Wed, 20 Feb 2013 02:33:39 +0000 (13:33 +1100)
author Stephen Rothwell <sfr@canb.auug.org.au>
Wed, 20 Feb 2013 02:33:39 +0000 (13:33 +1100)
committer Stephen Rothwell <sfr@canb.auug.org.au>
Wed, 20 Feb 2013 02:33:39 +0000 (13:33 +1100)
diff --cc Makefile
Simple merge
diff --cc init/Kconfig
Simple merge
diff --cc kernel/Makefile
Simple merge
diff --cc scripts/mod/modpost.c
Simple merge
author	Stephen Rothwell <sfr@canb.auug.org.au>
	Wed, 20 Feb 2013 02:33:39 +0000 (13:33 +1100)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Wed, 20 Feb 2013 02:33:39 +0000 (13:33 +1100)
		1	2
Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
init/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
kernel/Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
scripts/mod/modpost.c	patch \|	diff1 \|	diff2 \|	blob \| history