Merge branch 'picoxcell/devel' into next/devel

author Olof Johansson <olof@lixom.net>

Tue, 20 Dec 2011 05:12:47 +0000 (21:12 -0800)

committer Olof Johansson <olof@lixom.net>

Tue, 20 Dec 2011 05:12:53 +0000 (21:12 -0800)
author Olof Johansson <olof@lixom.net>
Tue, 20 Dec 2011 05:12:47 +0000 (21:12 -0800)
committer Olof Johansson <olof@lixom.net>
Tue, 20 Dec 2011 05:12:53 +0000 (21:12 -0800)
diff --cc MAINTAINERS
Simple merge
diff --cc arch/arm/kernel/perf_event.c
Simple merge
diff --cc arch/arm/mach-ux500/board-mop500.c
Simple merge
diff --cc mm/vmalloc.c
Simple merge
author	Olof Johansson <olof@lixom.net>
	Tue, 20 Dec 2011 05:12:47 +0000 (21:12 -0800)
committer	Olof Johansson <olof@lixom.net>
	Tue, 20 Dec 2011 05:12:53 +0000 (21:12 -0800)
		1	2
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/kernel/perf_event.c	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-ux500/board-mop500.c	patch \|	diff1 \|	diff2 \|	blob \| history
mm/vmalloc.c	patch \|	diff1 \|	diff2 \|	blob \| history