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: 1f4ca7f 2a22b63)

author	Stephen Rothwell <sfr@canb.auug.org.au>
	Mon, 2 Apr 2012 01:35:16 +0000 (11:35 +1000)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Mon, 2 Apr 2012 01:35:16 +0000 (11:35 +1000)
commit	63948f6402438707446927bd21238cb5c67974b1
tree	f665780421c00e8804a478f41ef54c67db638569	tree \| snapshot
parent	1f4ca7fc4609565cd409ce7a20db06ebc6904c1e	commit \| diff
parent	2a22b634997e16f378097816944229cbafac556c	commit \| diff

Merge branch 'quilt/rr'

Conflicts:
arch/arm/kernel/kprobes.c
drivers/virtio/virtio_balloon.c

15 files changed:

Documentation/virtual/virtio-spec.txt	diff1 \|	diff2 \|	blob \| history
arch/arm/kernel/kprobes.c	diff1 \|	diff2 \|	blob \| history
arch/arm/kernel/smp.c	diff1 \|	diff2 \|	blob \| history
arch/hexagon/kernel/smp.c	diff1 \|	diff2 \|	blob \| history
arch/ia64/kernel/acpi.c	diff1 \|	diff2 \|	blob \| history
arch/mips/cavium-octeon/smp.c	diff1 \|	diff2 \|	blob \| history
arch/mips/kernel/smp-bmips.c	diff1 \|	diff2 \|	blob \| history
arch/mips/kernel/smp.c	diff1 \|	diff2 \|	blob \| history
arch/mips/kernel/smtc.c	diff1 \|	diff2 \|	blob \| history
arch/mips/mm/c-octeon.c	diff1 \|	diff2 \|	blob \| history
arch/x86/xen/enlighten.c	diff1 \|	diff2 \|	blob \| history
drivers/cpufreq/db8500-cpufreq.c	diff1 \|	diff2 \|	blob \| history
include/linux/cpumask.h	diff1 \|	diff2 \|	blob \| history
init/Kconfig	diff1 \|	diff2 \|	blob \| history
kernel/cpuset.c	diff1 \|	diff2 \|	blob \| history

Linux kernel for KaRo TX COM modules