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

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

projects / karo-tx-linux.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: faa8ec6 1f02e5b)

author	Stephen Rothwell <sfr@canb.auug.org.au>
	Wed, 31 Jul 2013 06:35:15 +0000 (16:35 +1000)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Wed, 31 Jul 2013 06:35:15 +0000 (16:35 +1000)
commit	607a044e1419ea89cc5e746a47159db06fae2f63
tree	646447971b87ff62bd2bfc9f7697336f7dd9efa5	tree \| snapshot
parent	faa8ec62ea117c077c41e7743fc2615d96e15f66	commit \| diff
parent	1f02e5b30607cbef3c8b4d1376cba3689c399288	commit \| diff

Merge branch 'akpm-current/current'

Conflicts:
drivers/staging/lustre/lustre/ldlm/ldlm_pool.c

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
arch/x86/platform/ce4100/ce4100.c	diff1 \|	diff2 \|	blob \| history
arch/x86/platform/efi/efi.c	diff1 \|	diff2 \|	blob \| history
drivers/isdn/mISDN/core.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/lustre/lustre/ldlm/ldlm_pool.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/lustre/lustre/obdclass/lu_object.c	diff1 \|	diff2 \|	blob \| history
fs/binfmt_elf.c	diff1 \|	diff2 \|	blob \| history
include/linux/mm.h	diff1 \|	diff2 \|	blob \| history
include/linux/sched.h	diff1 \|	diff2 \|	blob \| history
kernel/printk/printk.c	diff1 \|	diff2 \|	blob \| history
kernel/sched/fair.c	diff1 \|	diff2 \|	blob \| history

Linux kernel for KaRo TX COM modules