From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 17 Apr 2012 02:03:02 +0000 (+1000)
Subject: Merge branch 'quilt/rr'
X-Git-Tag: next-20120417~38
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=c30a8f1da2c867dbf2879384a0f9e051cab52d4f;p=karo-tx-linux.git

Merge branch 'quilt/rr'

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

c30a8f1da2c867dbf2879384a0f9e051cab52d4f