From: Arnd Bergmann <arnd@arndb.de>
Date: Sat, 29 Mar 2014 01:02:27 +0000 (+0100)
Subject: Merge tag 'samsung-dt-3' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux... 
X-Git-Tag: v3.15-rc1~74^2~3
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=c441ab93d2b0ffec1852c1fd2186d262c2031d16;p=linux-2.6-block.git

Merge tag 'samsung-dt-3' of git://git./linux/kernel/git/kgene/linux-samsung into next/cleanup3

Merge "Samsung 3rd DT updates for v3.15" from Kukjin Kim:

- Arndale Octa board updates:
  LDO3 and LDO23 enabled for soft-reset
  LDO9 enabled for USB operation
  MDMA1 disabled to avoid imprecise external abort

Note that this is based on previous tags/samsung-dt-2

* tag 'samsung-dt-3' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
  ARM: dts: Keep some essential LDOs enabled for arndale-octa board
  ARM: dts: Disable MDMA1 node for arndale-octa board

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---

c441ab93d2b0ffec1852c1fd2186d262c2031d16