]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'tip/auto-latest'
authorStephen Rothwell <sfr@canb.auug.org.au>
Fri, 30 May 2014 04:21:30 +0000 (14:21 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 30 May 2014 04:21:30 +0000 (14:21 +1000)
commitafe0ddb9027b6d20301b9d973bd99f38ddb02d0b
treec66c28fe2ddc10817d61eee7e0f7bc734b87756d
parent8d0cc164833e7e7688f7137bb796b091ea49a146
parentaec36eaab6009517a7ded2009cdba3508106d4f2
Merge remote-tracking branch 'tip/auto-latest'

Conflicts:
arch/arm64/include/asm/thread_info.h
arch/arm64/mm/mmu.c
drivers/block/mtip32xx/mtip32xx.c
65 files changed:
arch/arm/Kconfig
arch/arm/kernel/topology.c
arch/arm64/Kconfig
arch/arm64/include/asm/atomic.h
arch/arm64/include/asm/barrier.h
arch/arm64/include/asm/thread_info.h
arch/arm64/kernel/Makefile
arch/arm64/kernel/head.S
arch/arm64/kernel/setup.c
arch/arm64/mm/mmu.c
arch/mips/kernel/irq.c
arch/powerpc/kernel/smp.c
arch/s390/kernel/topology.c
arch/s390/pci/pci.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/tile/include/asm/thread_info.h
arch/x86/Kconfig
arch/x86/kernel/entry_32.S
arch/x86/kernel/entry_64.S
block/blk-iopoll.c
drivers/firewire/ohci.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/broadcom/bnx2x/bnx2x_sriov.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/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
fs/btrfs/inode.c
fs/ext4/resize.c
fs/gfs2/glops.c
fs/gfs2/recovery.c
fs/gfs2/sys.c
fs/nfs/filelayout/filelayoutdev.c
fs/nfs/inode.c
fs/nfs/pagelist.c
fs/nfs/pnfs.c
fs/nfs/pnfs.h
fs/nfs/write.c
include/asm-generic/vmlinux.lds.h
include/linux/netdevice.h
include/linux/sched.h
include/linux/uprobes.h
init/main.c
kernel/events/uprobes.c
kernel/sysctl.c
lib/Makefile
mm/filemap.c
net/bluetooth/hci_event.c
net/core/dev.c
net/ipv4/inetpeer.c
net/ipv4/tcp_output.c
net/sunrpc/xprtsock.c
net/unix/af_unix.c