Merge branch 'lpc32xx/dts' of git://git.antcom.de/linux-2.6 into next/dt
authorOlof Johansson <olof@lixom.net>
Fri, 7 Sep 2012 21:59:25 +0000 (14:59 -0700)
committerOlof Johansson <olof@lixom.net>
Fri, 7 Sep 2012 21:59:25 +0000 (14:59 -0700)
commitfd6c9b75c7e341e0c6824be39ac81b32b7d9fe2f
tree91d8215beadd22de554cd32b6fe6cd9fffc5ea70
parent402efdb48d6a6aef9e91e3112a94b679d787fef7
parent25b3ab6c7e39e42245d98c27d25d9902baec7b65
Merge branch 'lpc32xx/dts' of git://git.antcom.de/linux-2.6 into next/dt

* 'lpc32xx/dts' of git://git.antcom.de/linux-2.6:
  ARM: LPC32xx: Extend dts for EA3250 board
  ARM: LPC32xx: Adjust device tree node to new standard num-cs