]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'tip/auto-latest'
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 20 May 2014 05:03:13 +0000 (15:03 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 20 May 2014 05:03:13 +0000 (15:03 +1000)
commit334e0cf9f8eaf57809b81dbe7fdcab891de64520
treef3f0bb393a7fdb42ffcf041f4dda68b9c0409118
parentfbed4356d0e0103535b8a91516f90896b43e3a00
parent1974363f7e899dc1b9e6e774dc885c7980a7159b
Merge remote-tracking branch 'tip/auto-latest'

Conflicts:
drivers/block/mtip32xx/mtip32xx.c
kernel/sched/idle.c
net/ipv4/tcp_output.c
43 files changed:
arch/arm/kernel/topology.c
arch/arm64/include/asm/atomic.h
arch/arm64/include/asm/barrier.h
arch/metag/include/asm/barrier.h
arch/s390/kernel/topology.c
arch/sparc/include/asm/atomic_32.h
arch/sparc/include/asm/atomic_64.h
arch/sparc/include/asm/bitops_32.h
arch/sparc/include/asm/bitops_64.h
arch/x86/Kconfig
arch/x86/kernel/entry_32.S
arch/x86/kernel/entry_64.S
block/blk-iopoll.c
drivers/gpu/drm/drm_irq.c
drivers/gpu/drm/i915/i915_irq.c
drivers/md/dm-snap.c
drivers/md/dm.c
drivers/md/raid5.c
drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
drivers/net/ethernet/chelsio/cxgb/cxgb2.c
drivers/net/ethernet/chelsio/cxgb4/sge.c
drivers/net/ethernet/chelsio/cxgb4vf/sge.c
drivers/net/ethernet/intel/i40e/i40e_main.c
drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c
drivers/net/wireless/ti/wlcore/main.c
fs/btrfs/inode.c
fs/ext4/resize.c
fs/gfs2/glops.c
fs/gfs2/recovery.c
fs/gfs2/sys.c
fs/nfs/inode.c
fs/nfs/write.c
include/linux/netdevice.h
init/main.c
kernel/sched/idle.c
kernel/sysctl.c
kernel/workqueue.c
mm/filemap.c
net/bluetooth/hci_event.c
net/core/dev.c
net/ipv4/inetpeer.c
net/ipv4/tcp_output.c