]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge branch 'akpm-current/current'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 12 Sep 2013 03:28:18 +0000 (13:28 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 12 Sep 2013 03:28:20 +0000 (13:28 +1000)
commit12395438273bf9457495e63f8baf93345781ac88
treec2966ea8332e61c48d3ee99c893677fb49c081ae
parentc5d5579a19e85764b64e15f8dab68108310b301a
parentea8adcaa2d6a9d8b3f9c19975f4328e1e7b81840
Merge branch 'akpm-current/current'

Conflicts:
Documentation/block/cmdline-partition.txt
drivers/block/aoe/aoeblk.c
drivers/rtc/rtc-hid-sensor-time.c
fs/namei.c
fs/namespace.c
include/linux/smp.h
kernel/fork.c
mm/mempolicy.c
mm/mlock.c
mm/sparse.c
scripts/checkpatch.pl
92 files changed:
Makefile
arch/arm/mach-omap2/omap_hwmod.c
arch/arm/mm/hugetlbpage.c
arch/powerpc/kernel/rtas.c
arch/tile/mm/highmem.c
arch/x86/include/asm/checksum_32.h
arch/x86/include/asm/e820.h
arch/x86/include/asm/uaccess.h
arch/x86/kernel/e820.c
arch/x86/lib/csum-wrappers_64.c
block/blk-cgroup.c
block/blk-core.c
block/genhd.c
drivers/atm/he.c
drivers/base/dma-buf.c
drivers/gpio/gpiolib.c
drivers/gpu/drm/nouveau/nouveau_acpi.c
drivers/infiniband/hw/cxgb3/iwch_cm.c
drivers/infiniband/hw/cxgb4/cm.c
drivers/isdn/mISDN/core.c
drivers/md/dm.c
drivers/md/raid5.c
drivers/misc/ti-st/st_core.c
drivers/mmc/core/core.c
drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c
drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.h
drivers/net/ethernet/broadcom/bnx2x/bnx2x_stats.c
drivers/net/ethernet/intel/e1000e/netdev.c
drivers/net/ethernet/sfc/falcon.c
drivers/net/irda/donauboe.c
drivers/net/wireless/ath/wil6210/wmi.c
drivers/net/wireless/b43/dma.c
drivers/net/wireless/b43/main.c
drivers/net/wireless/b43legacy/dma.c
drivers/net/wireless/cw1200/cw1200_spi.c
drivers/net/wireless/iwlwifi/iwl-op-mode.h
drivers/net/wireless/iwlwifi/iwl-trans.h
drivers/pci/iov.c
drivers/pci/pci.c
drivers/staging/lustre/lustre/llite/remote_perm.c
drivers/staging/lustre/lustre/obdclass/cl_lock.c
drivers/staging/lustre/lustre/obdclass/cl_object.c
drivers/staging/lustre/lustre/obdclass/cl_page.c
drivers/staging/lustre/lustre/osc/osc_lock.c
drivers/staging/lustre/lustre/osc/osc_page.c
drivers/staging/lustre/lustre/ptlrpc/client.c
drivers/staging/lustre/lustre/ptlrpc/gss/gss_cli_upcall.c
drivers/staging/lustre/lustre/ptlrpc/gss/gss_pipefs.c
drivers/staging/lustre/lustre/ptlrpc/sec.c
drivers/staging/lustre/lustre/ptlrpc/sec_config.c
drivers/staging/lustre/lustre/ptlrpc/sec_gc.c
drivers/usb/core/hcd.c
drivers/usb/core/urb.c
drivers/video/atmel_lcdfb.c
fs/anon_inodes.c
fs/autofs4/dev-ioctl.c
fs/block_dev.c
fs/dcache.c
fs/eventpoll.c
fs/ext3/inode.c
fs/ext4/inode.c
fs/ext4/mballoc.c
fs/fat/file.c
fs/fat/inode.c
fs/file_table.c
fs/inode.c
fs/nfs/nfs4proc.c
fs/nfs/nfs4state.c
fs/ocfs2/file.c
fs/xfs/xfs_mount.c
include/linux/buffer_head.h
include/linux/compat.h
include/linux/namei.h
kernel/fork.c
kernel/nsproxy.c
kernel/printk/printk.c
kernel/sched/core.c
kernel/smp.c
kernel/watchdog.c
lib/Kconfig
lib/Makefile
mm/filemap.c
mm/memory.c
mm/mmap.c
mm/rmap.c
net/mac80211/driver-ops.h
net/mac80211/key.c
net/mac80211/main.c
net/sunrpc/clnt.c
scripts/mod/modpost.c
scripts/sortextable.c