git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5ecdd39 a53bfa0)
Merge branch 'picoxcell/cleanup' into next/cleanup
authorOlof Johansson <olof@lixom.net>
Tue, 20 Dec 2011 05:12:24 +0000 (21:12 -0800)
committerOlof Johansson <olof@lixom.net>
Tue, 20 Dec 2011 05:13:41 +0000 (21:13 -0800)
* picoxcell/cleanup: (4 commits)
  MAINTAINERS: add maintainer entry for Picochip picoxcell
  ARM: picoxcell: move io mappings to common.c
  ARM: picoxcell: don't reserve irq_descs
  ARM: picoxcell: remove mach/memory.h

Conflicts:
arch/arm/mach-at91/setup.c


Trivial merge
Pandora Kernel Repository