From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 30 Apr 2012 02:39:06 +0000 (+1000)
Subject: Merge branch 'quilt/rr'
X-Git-Tag: next-20120430~47
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=b588498304c2ae2ce563018d5afeb2e6ceefb2b9;p=karo-tx-linux.git

Merge branch 'quilt/rr'

Conflicts:
	arch/arm/kernel/kprobes.c
	arch/arm/kernel/smp.c
	drivers/virtio/virtio_balloon.c
	init/main.c
---

b588498304c2ae2ce563018d5afeb2e6ceefb2b9