]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'at91-3.4-base+9x5' of git://github.com/at91linux/linux-at91 into at91/9x5
authorOlof Johansson <olof@lixom.net>
Tue, 7 Feb 2012 23:12:58 +0000 (15:12 -0800)
committerOlof Johansson <olof@lixom.net>
Tue, 7 Feb 2012 23:12:58 +0000 (15:12 -0800)
* 'at91-3.4-base+9x5' of git://github.com/at91linux/linux-at91:
  ARM: at91/at91sam9x5: Device tree definition files
  ARM: at91/at91sam9x5: SoC basic support
  ARM: at91/at91sam9x5: Configuration and Makefile
  ARM: at91/at91sam9x5: clock management for at91sam9x5 chip family
  ARM: at91/at91sam9x5: PMC header file
  ARM: at91/at91sam9x5: overall definition


Trivial merge