]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'trivial/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 13 Dec 2011 04:35:59 +0000 (15:35 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 13 Dec 2011 04:35:59 +0000 (15:35 +1100)
commite9f38cfe5cfdaacfe2bb0dc180195a2428f25cea
treed352713e8a15a002313ecdf0101b649673cb9f35
parent0b26d9d0dc4479d0939918894c1166020ecd2b36
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