]> Pileus Git - ~andy/linux/commitdiff
projects / ~andy / linux / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 94c16ea b65adbe)
Merge tag 'at91-cleanup' of git://github.com/at91linux/linux-at91 into next/cleanup
authorOlof Johansson <olof@lixom.net>
Sun, 10 Feb 2013 00:41:46 +0000 (16:41 -0800)
committerOlof Johansson <olof@lixom.net>
Sun, 10 Feb 2013 00:41:46 +0000 (16:41 -0800)
From Nicolas Ferre:
Little AT91 cleanup: only remove one deprecated board.

* tag 'at91-cleanup' of git://github.com/at91linux/linux-at91:
  ARM: at91: remove NEOCORE 926 board

Signed-off-by: Olof Johansson <olof@lixom.net>
Modify/remove conflict in arch/arm/mach-at91/board-neocore926.c


Trivial merge
Andy's Linux Kernel repo