Merge tag 'at91-fixes' of git://github.com/at91linux/linux-at91 into fixes
authorOlof Johansson <olof@lixom.net>
Tue, 21 May 2013 06:25:08 +0000 (23:25 -0700)
committerOlof Johansson <olof@lixom.net>
Tue, 21 May 2013 06:30:50 +0000 (23:30 -0700)
commit8582df0f637140b94d54d297d07edc8d6702f35c
tree5f4a9b4103be4be69acc557181521b90a485f182
parent4ae608e137a8b0e5a34a4f4c409f8468b4685df9
parentb7a8ca5173ef9aa55fa039d7c216426ff0b25a12
Merge tag 'at91-fixes' of git://github.com/at91linux/linux-at91 into fixes

From Nicolas Ferre:
An important revert on at91rm9200 platform related
to timers that prevented the platform to boot properly.
Then one pinctrl adjustments for SPI CS and a couple of
trivial typos.

* tag 'at91-fixes' of git://github.com/at91linux/linux-at91:
  ARM: at91: rm9200 fix time support
  ARM: at91: dts: request only spi cs-gpios used on sama5d3x cpu module
  ARM: at91/trivial: typo in GEM compatible string
  ARM: at91/trivial: fix model name for SAM9X25-EK

Signed-off-by: Olof Johansson <olof@lixom.net>