]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'modules/modules-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 3 Oct 2012 03:13:58 +0000 (13:13 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 3 Oct 2012 03:13:58 +0000 (13:13 +1000)
commit2fc9a3974607995284f99afeffa27866308a16ef
tree2aea24155c7eaed46d7352dc6eff326594508953
parent5902c85867de8f17251c7f097edfc07a19a0009f
parent8921e2ede91f93dcdbd08fa6613f8458de5f8afe
Merge remote-tracking branch 'modules/modules-next'

Conflicts:
arch/Kconfig
arch/x86/Kconfig
arch/x86/um/Kconfig
arch/xtensa/Kconfig
24 files changed:
Documentation/kernel-parameters.txt
Makefile
arch/Kconfig
arch/arm/Kconfig
arch/cris/Kconfig
arch/ia64/Kconfig
arch/mips/Kconfig
arch/powerpc/Kconfig
arch/s390/Kconfig
arch/tile/Kconfig
arch/unicore32/Kconfig
arch/x86/Kconfig
arch/x86/um/Kconfig
crypto/Kconfig
crypto/Makefile
fs/cifs/cifsacl.c
init/Kconfig
kernel/Makefile
net/dns_resolver/dns_key.c
net/rxrpc/ar-key.c
scripts/Makefile.modpost
security/keys/key.c
security/keys/keyctl.c
security/keys/keyring.c