From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 26 Jul 2011 03:36:00 +0000 (+1000)
Subject: Merge branch 'quilt/rr'
X-Git-Tag: next-20110726~33
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=cd82794df39ef918619e3d0e308edcd5ff03fd2a;p=karo-tx-linux.git

Merge branch 'quilt/rr'

Conflicts:
	arch/m68k/kernel/module_mm.c
	arch/m68k/kernel/module_no.c
	arch/x86/lguest/i386_head.S
---

cd82794df39ef918619e3d0e308edcd5ff03fd2a