From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 6 May 2014 01:20:00 +0000 (+1000)
Subject: Merge remote-tracking branch 'uml/next'
X-Git-Tag: next-20140506~84
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=f4e08d162c1f55fa4f76aa1354b1e2d8eed25a87;p=karo-tx-linux.git

Merge remote-tracking branch 'uml/next'

Conflicts:
	arch/um/include/asm/Kbuild
---

f4e08d162c1f55fa4f76aa1354b1e2d8eed25a87