git.karo-electronics.de Git - karo-tx-linux.git/commit

]> git.karo-electronics.de Git - karo-tx-linux.git/commit

author	Stephen Rothwell <sfr@canb.auug.org.au>
	Mon, 19 May 2014 07:23:08 +0000 (17:23 +1000)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Mon, 19 May 2014 07:23:08 +0000 (17:23 +1000)
commit	d49c22ded3f0f3f5dd983b946244762cd07b4d25
tree	19262441a2858c013bca748ec9851a9215213dd9	tree \| snapshot
parent	fa679210a42be88aa1b7a5fe1dd9ae66c6a4af2a	commit \| diff
parent	e58827aca533b70b6e6ea7ae53f8b18e2b1a5e77	commit \| diff

Merge branch 'akpm-current/current'

Conflicts:
mm/memcontrol.c

71 files changed:

Documentation/cgroups/memory.txt	diff1 \|	diff2 \|	blob \| history
Documentation/kernel-parameters.txt	diff1 \|	diff2 \|	blob \| history
Documentation/printk-formats.txt	diff1 \|	diff2 \|	blob \| history
MAINTAINERS	diff1 \|	diff2 \|	blob \| history
arch/arm/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/arm64/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/ia64/include/asm/topology.h	diff1 \|	diff2 \|	blob \| history
arch/powerpc/platforms/52xx/efika.c	diff1 \|	diff2 \|	blob \| history
arch/s390/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/x86/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/x86/mm/init_64.c	diff1 \|	diff2 \|	blob \| history
drivers/base/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/base/dma-contiguous.c	diff1 \|	diff2 \|	blob \| history
drivers/leds/Kconfig	diff1 \|	diff2 \|	blob \| history
fs/9p/vfs_file.c	diff1 \|	diff2 \|	blob \| history
fs/affs/file.c	diff1 \|	diff2 \|	blob \| history
fs/bio.c	diff1 \|	diff2 \|	blob \| history
fs/block_dev.c	diff1 \|	diff2 \|	blob \| history
fs/btrfs/extent_io.c	diff1 \|	diff2 \|	blob \| history
fs/btrfs/file.c	diff1 \|	diff2 \|	blob \| history
fs/buffer.c	diff1 \|	diff2 \|	blob \| history
fs/ceph/addr.c	diff1 \|	diff2 \|	blob \| history
fs/cifs/smb2ops.c	diff1 \|	diff2 \|	blob \| history
fs/cifs/smb2pdu.c	diff1 \|	diff2 \|	blob \| history
fs/cifs/smb2pdu.h	diff1 \|	diff2 \|	blob \| history
fs/ext4/mballoc.c	diff1 \|	diff2 \|	blob \| history
fs/ext4/page-io.c	diff1 \|	diff2 \|	blob \| history
fs/f2fs/checkpoint.c	diff1 \|	diff2 \|	blob \| history
fs/f2fs/node.c	diff1 \|	diff2 \|	blob \| history
fs/fat/inode.c	diff1 \|	diff2 \|	blob \| history
fs/fuse/file.c	diff1 \|	diff2 \|	blob \| history
fs/gfs2/aops.c	diff1 \|	diff2 \|	blob \| history
fs/ntfs/file.c	diff1 \|	diff2 \|	blob \| history
fs/ocfs2/file.c	diff1 \|	diff2 \|	blob \| history
include/linux/blkdev.h	diff1 \|	diff2 \|	blob \| history
include/linux/buffer_head.h	diff1 \|	diff2 \|	blob \| history
include/linux/compiler.h	diff1 \|	diff2 \|	blob \| history
include/linux/fs.h	diff1 \|	diff2 \|	blob \| history
include/linux/memblock.h	diff1 \|	diff2 \|	blob \| history
include/linux/page-flags.h	diff1 \|	diff2 \|	blob \| history
include/linux/sched.h	diff1 \|	diff2 \|	blob \| history
include/linux/smp.h	diff1 \|	diff2 \|	blob \| history
include/linux/thread_info.h	diff1 \|	diff2 \|	blob \| history
include/linux/topology.h	diff1 \|	diff2 \|	blob \| history
init/Kconfig	diff1 \|	diff2 \|	blob \| history
init/main.c	diff1 \|	diff2 \|	blob \| history
kernel/acct.c	diff1 \|	diff2 \|	blob \| history
kernel/audit.c	diff1 \|	diff2 \|	blob \| history
kernel/cpuset.c	diff1 \|	diff2 \|	blob \| history
kernel/kmod.c	diff1 \|	diff2 \|	blob \| history
kernel/sched/core.c	diff1 \|	diff2 \|	blob \| history
kernel/sched/deadline.c	diff1 \|	diff2 \|	blob \| history
kernel/sched/rt.c	diff1 \|	diff2 \|	blob \| history
kernel/seccomp.c	diff1 \|	diff2 \|	blob \| history
kernel/signal.c	diff1 \|	diff2 \|	blob \| history
kernel/smp.c	diff1 \|	diff2 \|	blob \| history
kernel/sysctl.c	diff1 \|	diff2 \|	blob \| history
lib/Kconfig	diff1 \|	diff2 \|	blob \| history
lib/Kconfig.debug	diff1 \|	diff2 \|	blob \| history
lib/Makefile	diff1 \|	diff2 \|	blob \| history
mm/Kconfig	diff1 \|	diff2 \|	blob \| history
mm/dmapool.c	diff1 \|	diff2 \|	blob \| history
mm/filemap.c	diff1 \|	diff2 \|	blob \| history
mm/huge_memory.c	diff1 \|	diff2 \|	blob \| history
mm/memblock.c	diff1 \|	diff2 \|	blob \| history
mm/memcontrol.c	diff1 \|	diff2 \|	blob \| history
mm/memory.c	diff1 \|	diff2 \|	blob \| history
mm/page-writeback.c	diff1 \|	diff2 \|	blob \| history
mm/page_io.c	diff1 \|	diff2 \|	blob \| history
mm/shmem.c	diff1 \|	diff2 \|	blob \| history
mm/vmscan.c	diff1 \|	diff2 \|	blob \| history

Linux kernel for KaRo TX COM modules

RSS Atom

Documentation/cgroups/memory.txt	diff1 \|	diff2 \|	blob \| history
Documentation/kernel-parameters.txt	diff1 \|	diff2 \|	blob \| history
Documentation/printk-formats.txt	diff1 \|	diff2 \|	blob \| history
MAINTAINERS	diff1 \|	diff2 \|	blob \| history
arch/arm/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/arm64/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/ia64/include/asm/topology.h	diff1 \|	diff2 \|	blob \| history
arch/powerpc/platforms/52xx/efika.c	diff1 \|	diff2 \|	blob \| history
arch/s390/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/x86/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/x86/mm/init_64.c	diff1 \|	diff2 \|	blob \| history
drivers/base/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/base/dma-contiguous.c	diff1 \|	diff2 \|	blob \| history
drivers/leds/Kconfig	diff1 \|	diff2 \|	blob \| history
fs/9p/vfs_file.c	diff1 \|	diff2 \|	blob \| history
fs/affs/file.c	diff1 \|	diff2 \|	blob \| history
fs/bio.c	diff1 \|	diff2 \|	blob \| history
fs/block_dev.c	diff1 \|	diff2 \|	blob \| history
fs/btrfs/extent_io.c	diff1 \|	diff2 \|	blob \| history
fs/btrfs/file.c	diff1 \|	diff2 \|	blob \| history
fs/buffer.c	diff1 \|	diff2 \|	blob \| history
fs/ceph/addr.c	diff1 \|	diff2 \|	blob \| history
fs/cifs/smb2ops.c	diff1 \|	diff2 \|	blob \| history
fs/cifs/smb2pdu.c	diff1 \|	diff2 \|	blob \| history
fs/cifs/smb2pdu.h	diff1 \|	diff2 \|	blob \| history
fs/ext4/mballoc.c	diff1 \|	diff2 \|	blob \| history
fs/ext4/page-io.c	diff1 \|	diff2 \|	blob \| history
fs/f2fs/checkpoint.c	diff1 \|	diff2 \|	blob \| history
fs/f2fs/node.c	diff1 \|	diff2 \|	blob \| history
fs/fat/inode.c	diff1 \|	diff2 \|	blob \| history
fs/fuse/file.c	diff1 \|	diff2 \|	blob \| history
fs/gfs2/aops.c	diff1 \|	diff2 \|	blob \| history
fs/ntfs/file.c	diff1 \|	diff2 \|	blob \| history
fs/ocfs2/file.c	diff1 \|	diff2 \|	blob \| history
include/linux/blkdev.h	diff1 \|	diff2 \|	blob \| history
include/linux/buffer_head.h	diff1 \|	diff2 \|	blob \| history
include/linux/compiler.h	diff1 \|	diff2 \|	blob \| history
include/linux/fs.h	diff1 \|	diff2 \|	blob \| history
include/linux/memblock.h	diff1 \|	diff2 \|	blob \| history
include/linux/page-flags.h	diff1 \|	diff2 \|	blob \| history
include/linux/sched.h	diff1 \|	diff2 \|	blob \| history
include/linux/smp.h	diff1 \|	diff2 \|	blob \| history
include/linux/thread_info.h	diff1 \|	diff2 \|	blob \| history
include/linux/topology.h	diff1 \|	diff2 \|	blob \| history
init/Kconfig	diff1 \|	diff2 \|	blob \| history
init/main.c	diff1 \|	diff2 \|	blob \| history
kernel/acct.c	diff1 \|	diff2 \|	blob \| history
kernel/audit.c	diff1 \|	diff2 \|	blob \| history
kernel/cpuset.c	diff1 \|	diff2 \|	blob \| history
kernel/kmod.c	diff1 \|	diff2 \|	blob \| history
kernel/sched/core.c	diff1 \|	diff2 \|	blob \| history
kernel/sched/deadline.c	diff1 \|	diff2 \|	blob \| history
kernel/sched/rt.c	diff1 \|	diff2 \|	blob \| history
kernel/seccomp.c	diff1 \|	diff2 \|	blob \| history
kernel/signal.c	diff1 \|	diff2 \|	blob \| history
kernel/smp.c	diff1 \|	diff2 \|	blob \| history
kernel/sysctl.c	diff1 \|	diff2 \|	blob \| history
lib/Kconfig	diff1 \|	diff2 \|	blob \| history
lib/Kconfig.debug	diff1 \|	diff2 \|	blob \| history
lib/Makefile	diff1 \|	diff2 \|	blob \| history
mm/Kconfig	diff1 \|	diff2 \|	blob \| history
mm/dmapool.c	diff1 \|	diff2 \|	blob \| history
mm/filemap.c	diff1 \|	diff2 \|	blob \| history
mm/huge_memory.c	diff1 \|	diff2 \|	blob \| history
mm/memblock.c	diff1 \|	diff2 \|	blob \| history
mm/memcontrol.c	diff1 \|	diff2 \|	blob \| history
mm/memory.c	diff1 \|	diff2 \|	blob \| history
mm/page-writeback.c	diff1 \|	diff2 \|	blob \| history
mm/page_io.c	diff1 \|	diff2 \|	blob \| history
mm/shmem.c	diff1 \|	diff2 \|	blob \| history
mm/vmscan.c	diff1 \|	diff2 \|	blob \| history