]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'modules/modules-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 8 Oct 2012 00:48:40 +0000 (11:48 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 8 Oct 2012 00:48:40 +0000 (11:48 +1100)
commit5e393cb307e24b67d8c400c24e098ef2c696f8d5
tree54e73ea6d0f4ab52a26fd617c51954708e290eed
parent3aa4efa4af9699f2792d0fd6ae7002ad3813c333
parent21536bb994be78dc6451c93055531da2c84ce5d1
Merge remote-tracking branch 'modules/modules-next'

Conflicts:
Makefile
arch/Kconfig
arch/cris/include/asm/Kbuild
arch/h8300/include/asm/Kbuild
arch/m32r/include/asm/Kbuild
arch/x86/Kconfig
arch/x86/um/Kconfig
arch/xtensa/Kconfig
init/Kconfig
33 files changed:
Documentation/kernel-parameters.txt
Makefile
arch/Kconfig
arch/arm/Kconfig
arch/cris/Kconfig
arch/cris/include/asm/Kbuild
arch/h8300/include/asm/Kbuild
arch/ia64/Kconfig
arch/m32r/include/asm/Kbuild
arch/microblaze/Kconfig
arch/mips/Kconfig
arch/mips/kernel/Makefile
arch/parisc/Kconfig
arch/powerpc/Kconfig
arch/s390/Kconfig
arch/score/Kconfig
arch/sparc/include/asm/Kbuild
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
security/keys/trusted.c