git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8b1a13b e6ca4ae)
Merge branch 'next/boards' into HEAD
authorOlof Johansson <olof@lixom.net>
Mon, 1 Oct 2012 21:34:39 +0000 (14:34 -0700)
committerOlof Johansson <olof@lixom.net>
Mon, 1 Oct 2012 21:34:39 +0000 (14:34 -0700)
Conflicts:
arch/arm/mach-shmobile/board-armadillo800eva.c


Trivial merge
Pandora Kernel Repository