git.karo-electronics.de Git - karo-tx-linux.git/commit

]> git.karo-electronics.de Git - karo-tx-linux.git/commit

author	Stephen Rothwell <sfr@canb.auug.org.au>
	Mon, 19 Dec 2011 04:01:20 +0000 (15:01 +1100)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Mon, 19 Dec 2011 04:01:20 +0000 (15:01 +1100)
commit	851144a135181c0bd9248b70fae2f751043bee8a
tree	7e8a8546c556890511d4e5ad70ae355b2c80b735	tree \| snapshot
parent	6590f1731b4119b801ec719d0b3d3c4f7cb40364	commit \| diff
parent	cb54f2571ff3f5128f18efcf888ce3c051c589d9	commit \| diff

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

Conflicts:
arch/powerpc/platforms/40x/Kconfig

30 files changed:

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
arch/arm/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/arm/plat-omap/include/plat/serial.h	diff1 \|	diff2 \|	blob \| history
arch/mips/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/powerpc/platforms/40x/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/powerpc/platforms/44x/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/s390/Kconfig	diff1 \|	diff2 \|	blob \| history
crypto/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/gpio/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/mtd/nand/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/chelsio/cxgb4vf/sge.c	diff1 \|	diff2 \|	blob \| history
drivers/scsi/qla4xxx/ql4_fw.h	diff1 \|	diff2 \|	blob \| history
drivers/spi/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/tty/serial/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/usb/gadget/Kconfig	diff1 \|	diff2 \|	blob \| history
fs/btrfs/free-space-cache.c	diff1 \|	diff2 \|	blob \| history
fs/btrfs/inode.c	diff1 \|	diff2 \|	blob \| history
fs/ext4/inode.c	diff1 \|	diff2 \|	blob \| history
fs/namespace.c	diff1 \|	diff2 \|	blob \| history
fs/nfsd/nfs4state.c	diff1 \|	diff2 \|	blob \| history
fs/ocfs2/file.c	diff1 \|	diff2 \|	blob \| history
fs/xfs/xfs_buf.c	diff1 \|	diff2 \|	blob \| history
fs/xfs/xfs_log_cil.c	diff1 \|	diff2 \|	blob \| history
include/drm/drmP.h	diff1 \|	diff2 \|	blob \| history
include/linux/security.h	diff1 \|	diff2 \|	blob \| history
include/net/mac80211.h	diff1 \|	diff2 \|	blob \| history
kernel/irq/manage.c	diff1 \|	diff2 \|	blob \| history
lib/Kconfig	diff1 \|	diff2 \|	blob \| history
mm/page_alloc.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/Kconfig	diff1 \|	diff2 \|	blob \| history

Linux kernel for KaRo TX COM modules

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
arch/arm/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/arm/plat-omap/include/plat/serial.h	diff1 \|	diff2 \|	blob \| history
arch/mips/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/powerpc/platforms/40x/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/powerpc/platforms/44x/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/s390/Kconfig	diff1 \|	diff2 \|	blob \| history
crypto/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/gpio/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/mtd/nand/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/chelsio/cxgb4vf/sge.c	diff1 \|	diff2 \|	blob \| history
drivers/scsi/qla4xxx/ql4_fw.h	diff1 \|	diff2 \|	blob \| history
drivers/spi/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/tty/serial/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/usb/gadget/Kconfig	diff1 \|	diff2 \|	blob \| history
fs/btrfs/free-space-cache.c	diff1 \|	diff2 \|	blob \| history
fs/btrfs/inode.c	diff1 \|	diff2 \|	blob \| history
fs/ext4/inode.c	diff1 \|	diff2 \|	blob \| history
fs/namespace.c	diff1 \|	diff2 \|	blob \| history
fs/nfsd/nfs4state.c	diff1 \|	diff2 \|	blob \| history
fs/ocfs2/file.c	diff1 \|	diff2 \|	blob \| history
fs/xfs/xfs_buf.c	diff1 \|	diff2 \|	blob \| history
fs/xfs/xfs_log_cil.c	diff1 \|	diff2 \|	blob \| history
include/drm/drmP.h	diff1 \|	diff2 \|	blob \| history
include/linux/security.h	diff1 \|	diff2 \|	blob \| history
include/net/mac80211.h	diff1 \|	diff2 \|	blob \| history
kernel/irq/manage.c	diff1 \|	diff2 \|	blob \| history
lib/Kconfig	diff1 \|	diff2 \|	blob \| history
mm/page_alloc.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/Kconfig	diff1 \|	diff2 \|	blob \| history