]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'trivial/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Fri, 9 Dec 2011 03:03:20 +0000 (14:03 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 9 Dec 2011 03:03:20 +0000 (14:03 +1100)
commite7524b4417badb5016e754ccf9f53d3d360be2d5
treedf787cde766b30b906ff924821e547374b22b0ae
parent7d0156d0d53a7e54bbc437628fcc82157a21ae0d
parenta1d51aa70c71c318d878a67937d1e67f455ae8fa
Merge remote-tracking branch 'trivial/for-next'

Conflicts:
arch/powerpc/platforms/40x/Kconfig
net/mac80211/work.c
22 files changed:
MAINTAINERS
arch/arm/Kconfig
arch/mips/Kconfig
arch/powerpc/platforms/40x/Kconfig
arch/s390/Kconfig
crypto/Kconfig
drivers/gpio/Kconfig
drivers/mtd/nand/Kconfig
drivers/net/ethernet/chelsio/cxgb4vf/sge.c
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