Merge tag 'ux500-devicetree-v3.14-2' of git://git.kernel.org/pub/scm/linux/kernel...
authorOlof Johansson <olof@lixom.net>
Thu, 9 Jan 2014 06:09:14 +0000 (22:09 -0800)
committerOlof Johansson <olof@lixom.net>
Thu, 9 Jan 2014 06:09:14 +0000 (22:09 -0800)
commit9ebde306cf482cde18669dd5592665376fb59aef
treea545b8c69342b9c794b8db15f39ffe8634c76d0e
parent708d2aa14d1eefef3dd758242787e837485baad7
parent0e7a268a9e2d85d36f146f9dcf1f54488111f3d8
Merge tag 'ux500-devicetree-v3.14-2' of git://git./linux/kernel/git/linusw/linux-stericsson into next/dt

From Linus Walleij:
Ux500 device tree patches for v3.14, take 2
- Delete some unused U8540 UART platform data.
- MMC/SD-fixes from Ulf Hansson so everything works with
  the device tree again.

* tag 'ux500-devicetree-v3.14-2' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson:
  ARM: ux500: regulators: Remove dead code for SD-card regulator
  ARM: ux500: Configure regulator for I/O voltage for SD-card slot
  ARM: ux500: Refactor common DT configs for sdi[n] devices
  ARM: ux500: delete U8540 UART auxdata

Signed-off-by: Olof Johansson <olof@lixom.net>
arch/arm/mach-ux500/cpu-db8500.c