tree fdfe4de420c66517a2e4a2a25a454997c6210e95
parent 5ecdd39f6cdd57aa42e072bf30aa7239fd109d7a
parent a53bfa07369b7c3448a60d29f0fc2e81751ed0b7
author Olof Johansson <olof@lixom.net> 1324357944 -0800
committer Olof Johansson <olof@lixom.net> 1324358021 -0800

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