]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'trivial/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 14 Dec 2011 03:13:26 +0000 (14:13 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 14 Dec 2011 03:13:26 +0000 (14:13 +1100)
commit663bb3ee3ca7b786dcc080f4849c8e046d7079b3
treed49a3372a8db770297753e23951b78ea710c8ed7
parent7318b1a9ff58b1f36a6548c6f77fdbba0deaaa11
parent3f865490698871bf77eebce05208fd08e9b45aeb
Merge remote-tracking branch 'trivial/for-next'

Conflicts:
arch/powerpc/platforms/40x/Kconfig
27 files changed:
MAINTAINERS
arch/arm/Kconfig
arch/mips/Kconfig
arch/powerpc/platforms/40x/Kconfig
arch/powerpc/platforms/44x/Kconfig
arch/s390/Kconfig
crypto/Kconfig
drivers/gpio/Kconfig
drivers/mtd/nand/Kconfig
drivers/net/ethernet/chelsio/cxgb4vf/sge.c
drivers/scsi/qla2xxx/qla_nx.c
drivers/scsi/qla4xxx/ql4_fw.h
drivers/spi/Kconfig
drivers/tty/serial/Kconfig
drivers/usb/gadget/Kconfig
fs/btrfs/inode.c
fs/ext4/inode.c
fs/namespace.c
fs/nfsd/nfs4state.c
fs/ocfs2/file.c
include/drm/drmP.h
include/linux/security.h
include/net/mac80211.h
kernel/irq/manage.c
lib/Kconfig
mm/page_alloc.c
net/ipv4/Kconfig