]> Gentwo Git Trees - linux/.git/commit
gentwo / linux / .git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(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)
commit844e8a16f25568eefd02a6bfb40bdd9bc04704b8
treefdfe4de420c66517a2e4a2a25a454997c6210e95tree | snapshot
parent5ecdd39f6cdd57aa42e072bf30aa7239fd109d7acommit | diff
parenta53bfa07369b7c3448a60d29f0fc2e81751ed0b7commit | diff
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
MAINTAINERS diff1 | diff2 | blob | history
arch/arm/kernel/perf_event.c diff1 | diff2 | blob | history
arch/arm/mach-at91/setup.c diff1 | diff2 | blob | history
mm/vmalloc.c diff1 | diff2 | blob | history
Development tree.