]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: bea0f78 84e41f4)
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)
commit378c0126084ebd5b94a1796fed8ff2c9bee34566
treefdfe4de420c66517a2e4a2a25a454997c6210e95tree | snapshot
parentbea0f78a165834b851b5da762fbed573ecc97fb1commit | diff
parent84e41f4eeb339bb8c51782a814d4cfc201335009commit | 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
Linux Kernel Source Tree.