]> 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, 6 Dec 2011 01:27:56 +0000 (12:27 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 6 Dec 2011 01:27:56 +0000 (12:27 +1100)
commit397acee0fa52e71e97d80e781932bbad4a7c64e5
tree256134f0b6c7a9d5323d1597c9a398f703df593e
parent1cde8e61dc6852fad6a0e74fad3e6b9481759ca0
parent05183189ee5df8799b22c56d93f0f69b8490e33f
Merge remote-tracking branch 'trivial/for-next'

Conflicts:
arch/powerpc/platforms/40x/Kconfig
net/mac80211/work.c
21 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/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