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

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

Thu, 17 Nov 2011 01:49:15 +0000 (12:49 +1100)

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

Thu, 17 Nov 2011 01:49:15 +0000 (12:49 +1100)
author Stephen Rothwell <sfr@canb.auug.org.au>
Thu, 17 Nov 2011 01:49:15 +0000 (12:49 +1100)
committer Stephen Rothwell <sfr@canb.auug.org.au>
Thu, 17 Nov 2011 01:49:15 +0000 (12:49 +1100)
diff --cc MAINTAINERS
Simple merge
diff --cc arch/arm/Kconfig
Simple merge
diff --cc arch/mips/Kconfig
Simple merge
diff --cc arch/s390/Kconfig
Simple merge
diff --cc crypto/Kconfig
Simple merge
diff --cc drivers/spi/Kconfig
Simple merge
diff --cc drivers/usb/gadget/Kconfig
Simple merge
diff --cc include/linux/security.h
Simple merge
author	Stephen Rothwell <sfr@canb.auug.org.au>
	Thu, 17 Nov 2011 01:49:15 +0000 (12:49 +1100)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Thu, 17 Nov 2011 01:49:15 +0000 (12:49 +1100)
		1	2
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
arch/mips/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
arch/s390/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
crypto/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/spi/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/usb/gadget/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
include/linux/security.h	patch \|	diff1 \|	diff2 \|	blob \| history