]> 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, 21 Dec 2011 03:32:27 +0000 (14:32 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 21 Dec 2011 03:32:27 +0000 (14:32 +1100)
commit4f9ba7e83244fdfea9b066a9ed60dd64a695ebb3
treef133e26e878df36ee452c0867c1f4da3f43329ee
parentf5acf09dd82f1fe0887cdab44c8793dbe5fb35aa
parentcb54f2571ff3f5128f18efcf888ce3c051c589d9
Merge remote-tracking branch 'trivial/for-next'

Conflicts:
arch/powerpc/platforms/40x/Kconfig
33 files changed:
MAINTAINERS
arch/arm/Kconfig
arch/arm/plat-omap/include/plat/serial.h
arch/mips/Kconfig
arch/powerpc/mm/numa.c
arch/powerpc/platforms/40x/Kconfig
arch/powerpc/platforms/44x/Kconfig
arch/s390/Kconfig
crypto/Kconfig
drivers/gpio/Kconfig
drivers/leds/Kconfig
drivers/mtd/nand/Kconfig
drivers/net/ethernet/chelsio/cxgb4vf/sge.c
drivers/scsi/qla4xxx/ql4_fw.h
drivers/spi/Kconfig
drivers/tty/serial/Kconfig
drivers/usb/gadget/Kconfig
fs/btrfs/free-space-cache.c
fs/btrfs/inode.c
fs/ext4/inode.c
fs/namespace.c
fs/nfsd/nfs4state.c
fs/ocfs2/file.c
fs/xfs/xfs_buf.c
fs/xfs/xfs_log_cil.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
sound/core/Kconfig