Merge tag 'at91-dt2' of git://github.com/at91linux/linux-at91 into next/dt
authorArnd Bergmann <arnd@arndb.de>
Fri, 5 Sep 2014 20:28:00 +0000 (22:28 +0200)
committerArnd Bergmann <arnd@arndb.de>
Fri, 5 Sep 2014 20:28:00 +0000 (22:28 +0200)
commitd62584f3c7e7edf26512cbfe5d1723ef3fb739cd
treef671a3e0774c8b38f8dcdd269df2aec7a7dccf73
parent046ed3cc8886cd7f5e06cfa22e9d7c3e30873a1e
parent5f8157309624929e05ece846d3ca8a3a64988378
Merge tag 'at91-dt2' of git://github.com/at91linux/linux-at91 into next/dt

Pull "Second batch of AT91 DT patches for 3.18" from Nicolas Ferre:

- 2 little fixes for at91sam9x5 and at91sam9n12ek
- removal of a board specific hook for sama5d3xek about phy fixup
  replaced with proper DT property definition.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
* tag 'at91-dt2' of git://github.com/at91linux/linux-at91:
  ARM: at91: remove phy fixup for sama5d3xek boards
  ARM: at91/dt: describe rgmii ethernet phy connected to sama5d3xek boards
  ARM: at91/dt: sam9n12ek: ohci: add port and vbus property
  ARM: at91/dt: sam9x5: fix ADC compatible string