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>
	Wed, 7 May 2014 06:30:05 +0000 (16:30 +1000)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Wed, 7 May 2014 06:30:05 +0000 (16:30 +1000)
commit	af5581dec69602a389f4d24769934eeeec57d3ba
tree	e0498915165d7cfc768d5c749bdacc17698e1f25	tree \| snapshot
parent	c8b9bd0afad2c5f5aca6d5d7a72f2e59b717b9da	commit \| diff
parent	cda3e4f6eba8d9e7595346e46cf56e81fc58e58f	commit \| diff

Merge branch 'akpm-current/current'

Conflicts:
arch/x86/kernel/apic/hw_nmi.c
fs/affs/super.c
fs/hugetlbfs/inode.c
mm/compaction.c
mm/memblock.c
mm/slab.h
mm/slab_common.c

49 files changed:

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/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/kernel/apic/hw_nmi.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/buffer.c	diff1 \|	diff2 \|	blob \| history
fs/ceph/addr.c	diff1 \|	diff2 \|	blob \| history
fs/ceph/inode.c	diff1 \|	diff2 \|	blob \| history
fs/fat/file.c	diff1 \|	diff2 \|	blob \| history
fs/fat/inode.c	diff1 \|	diff2 \|	blob \| history
fs/hugetlbfs/inode.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/memblock.h	diff1 \|	diff2 \|	blob \| history
include/linux/mm.h	diff1 \|	diff2 \|	blob \| history
include/linux/rcupdate.h	diff1 \|	diff2 \|	blob \| history
include/linux/sched.h	diff1 \|	diff2 \|	blob \| history
include/linux/thread_info.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/kmod.c	diff1 \|	diff2 \|	blob \| history
kernel/rcu/update.c	diff1 \|	diff2 \|	blob \| history
kernel/sched/core.c	diff1 \|	diff2 \|	blob \| history
kernel/sched/rt.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/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/page_io.c	diff1 \|	diff2 \|	blob \| history
mm/slab.c	diff1 \|	diff2 \|	blob \| history
mm/util.c	diff1 \|	diff2 \|	blob \| history
mm/vmscan.c	diff1 \|	diff2 \|	blob \| history

Linux kernel for KaRo TX COM modules

RSS Atom

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/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/kernel/apic/hw_nmi.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/buffer.c	diff1 \|	diff2 \|	blob \| history
fs/ceph/addr.c	diff1 \|	diff2 \|	blob \| history
fs/ceph/inode.c	diff1 \|	diff2 \|	blob \| history
fs/fat/file.c	diff1 \|	diff2 \|	blob \| history
fs/fat/inode.c	diff1 \|	diff2 \|	blob \| history
fs/hugetlbfs/inode.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/memblock.h	diff1 \|	diff2 \|	blob \| history
include/linux/mm.h	diff1 \|	diff2 \|	blob \| history
include/linux/rcupdate.h	diff1 \|	diff2 \|	blob \| history
include/linux/sched.h	diff1 \|	diff2 \|	blob \| history
include/linux/thread_info.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/kmod.c	diff1 \|	diff2 \|	blob \| history
kernel/rcu/update.c	diff1 \|	diff2 \|	blob \| history
kernel/sched/core.c	diff1 \|	diff2 \|	blob \| history
kernel/sched/rt.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/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/page_io.c	diff1 \|	diff2 \|	blob \| history
mm/slab.c	diff1 \|	diff2 \|	blob \| history
mm/util.c	diff1 \|	diff2 \|	blob \| history
mm/vmscan.c	diff1 \|	diff2 \|	blob \| history