]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge branch 'next/boards' into for-next
authorOlof Johansson <olof@lixom.net>
Sun, 16 Sep 2012 23:38:51 +0000 (16:38 -0700)
committerOlof Johansson <olof@lixom.net>
Sun, 16 Sep 2012 23:39:37 +0000 (16:39 -0700)
commitac923cfad14367385a1d34d25c77eb86c7647542
treeaf8ecc2547c405f2cf2eac47c52bb0c935c086d4
parent997c771ff882c0fdad2de36ac8af7b09b3072fb3
parentfd5812e0a5816ff0dc665485bb3746e788cbd48e
Merge branch 'next/boards' into for-next

* next/boards:
  ARM: shmobile: armadillo800eva: Add support RTC

Fixed trivial conflict with fix in arch/arm/mach-shmobile/board-armadillo800eva.c
arch/arm/arm-soc-for-next-contents.txt
arch/arm/configs/armadillo800eva_defconfig
arch/arm/mach-shmobile/board-armadillo800eva.c