Merge tag 'at91-fixes' of git://github.com/at91linux/linux-at91 into fixes
authorArnd Bergmann <arnd@arndb.de>
Sat, 26 Apr 2014 09:29:30 +0000 (11:29 +0200)
committerArnd Bergmann <arnd@arndb.de>
Sat, 26 Apr 2014 09:29:30 +0000 (11:29 +0200)
3.15 fixes for AT91
- one little DT fix
- the use of proper directory for clock in include/dt-bindings
  it allows to remove the now empty include/dt-bindings/clk

* tag 'at91-fixes' of git://github.com/at91linux/linux-at91:
  dt-bindings: clock: Move at91.h to dt-bindigs/clock
  ARM: at91: fix spi cs on sama5d3 Xplained board

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

Trivial merge