From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 6 Jan 2014 00:34:29 +0000 (+1100)
Subject: Merge remote-tracking branch 'mpc5xxx/next'
X-Git-Tag: next-20140106~92
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=6a7c7e559d044fe52884be4a2497e56f81a12c42;p=karo-tx-linux.git

Merge remote-tracking branch 'mpc5xxx/next'

Conflicts:
	arch/powerpc/boot/dts/mpc5125twr.dts
---

6a7c7e559d044fe52884be4a2497e56f81a12c42