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

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

Wed, 7 Nov 2012 00:57:55 +0000 (11:57 +1100)

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

Wed, 7 Nov 2012 00:57:55 +0000 (11:57 +1100)
author Stephen Rothwell <sfr@canb.auug.org.au>
Wed, 7 Nov 2012 00:57:55 +0000 (11:57 +1100)
committer Stephen Rothwell <sfr@canb.auug.org.au>
Wed, 7 Nov 2012 00:57:55 +0000 (11:57 +1100)
diff --cc Makefile
Simple merge
diff --cc kernel/module.c
Simple merge
author	Stephen Rothwell <sfr@canb.auug.org.au>
	Wed, 7 Nov 2012 00:57:55 +0000 (11:57 +1100)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Wed, 7 Nov 2012 00:57:55 +0000 (11:57 +1100)
		1	2
Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
kernel/module.c	patch \|	diff1 \|	diff2 \|	blob \| history