]> 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, 7 Dec 2011 02:48:26 +0000 (13:48 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 7 Dec 2011 02:48:26 +0000 (13:48 +1100)
commit617cc5a0f8aa219e3857942a18503721be2b71bb
treeaabd0cc2850bb51cfbfe6e2f20dbe85a66278ff6
parent22eb132ced3066b2231061541ed12f64cc3d24d7
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