From: Olof Johansson <olof@lixom.net>
Date: Tue, 20 Dec 2011 05:12:24 +0000 (-0800)
Subject: Merge branch 'picoxcell/cleanup' into next/cleanup
X-Git-Tag: v3.3-rc1~144^2~4
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=844e8a16f25568eefd02a6bfb40bdd9bc04704b8;p=pandora-kernel.git

Merge branch 'picoxcell/cleanup' into next/cleanup

* 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
---

844e8a16f25568eefd02a6bfb40bdd9bc04704b8
Reading git-diff-tree failed