]> 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, 6 May 2014 03:59:12 +0000 (13:59 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 6 May 2014 03:59:12 +0000 (13:59 +1000)
commit3c84611da2d3f02320c43bd03dbd2cb01c84e4c4
tree6dc969b52e495ef92fefce8052a4bb42a6ca12e8
parent556e38a6aa53ead07f61c15d8c9cf474669dc935
parent2366096ae552484bd819955b329b87d0d8e0ebba
Merge remote-tracking branch 'tip/auto-latest'

Conflicts:
net/ipv4/tcp_output.c
25 files changed:
arch/x86/Kconfig
block/blk-iopoll.c
drivers/block/mtip32xx/mtip32xx.c
drivers/gpu/drm/drm_irq.c
drivers/gpu/drm/i915/i915_irq.c
drivers/md/dm.c
drivers/md/raid5.c
drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.c
drivers/net/ethernet/freescale/gianfar.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
drivers/tty/n_tty.c
fs/btrfs/inode.c
fs/nfs/inode.c
fs/nfs/write.c
include/linux/netdevice.h
init/main.c
mm/filemap.c
net/bluetooth/hci_event.c
net/core/dev.c
net/ipv4/inetpeer.c
net/ipv4/tcp_output.c