Merge remote-tracking branch 'agust/merge' into merge

Anatolij Gustschin says:

<<
Please pull a device tree fix for v3.13. The booting on mpc512x
is broken since v3.13-rc1, this patch repairs it.
>>
This commit is contained in:
Benjamin Herrenschmidt 2013-12-10 11:24:10 +11:00
commit e80ba46120