Merge branch 'quilt/rr'

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

diff --cc Documentation/virtual/virtio-spec.txt
Simple merge

diff --cc arch/arm/kernel/kprobes.c
Simple merge

diff --cc arch/arm/kernel/smp.c
Simple merge

diff --cc arch/hexagon/kernel/smp.c
Simple merge

diff --cc arch/ia64/kernel/acpi.c
Simple merge

diff --cc arch/mips/cavium-octeon/smp.c
Simple merge

diff --cc arch/mips/kernel/smp-bmips.c
Simple merge

diff --cc arch/mips/kernel/smp.c
Simple merge

diff --cc arch/mips/kernel/smtc.c
Simple merge

diff --cc arch/mips/mm/c-octeon.c
Simple merge

diff --cc arch/x86/xen/enlighten.c
Simple merge

diff --cc drivers/cpufreq/db8500-cpufreq.c
Simple merge

diff --cc include/linux/cpumask.h
Simple merge

diff --cc init/Kconfig
Simple merge

diff --cc kernel/cpuset.c
Simple merge