projects / platform / upstream / kernel-adaptation-pc.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 0d167e0 467f1cf)
Merge branch 'at91-3.4-base+9x5' of git://github.com/at91linux/linux-at91 into next/soc
authorOlof Johansson <olof@lixom.net>
Tue, 7 Feb 2012 23:19:08 +0000 (15:19 -0800)
committerOlof Johansson <olof@lixom.net>
Tue, 7 Feb 2012 23:19:08 +0000 (15:19 -0800)
commite69128b947da0a2474447868f73c76311e2baedb
tree73f84e2a0e55bcda2e14d28b011c250a14203e0dtree | snapshot
parent0d167e0dd3e28ee5502a0e9f8d10c9730d35c5b7commit | diff
parent467f1cf504fbe8c50018c9b45ff465b379bc81f8commit | diff
Merge branch 'at91-3.4-base+9x5' of git://github.com/at91linux/linux-at91 into next/soc

* '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
  ARM: at91: code removal of CAP9 SoC

Conflicts:
arch/arm/mach-at91/at91cap9.c
Domain: System / Uncategorized;