Merge branch 'omap/soc' into next/soc

author Olof Johansson <olof@lixom.net>

Fri, 16 Dec 2011 06:02:11 +0000 (22:02 -0800)

committer Olof Johansson <olof@lixom.net>

Fri, 16 Dec 2011 06:02:11 +0000 (22:02 -0800)
author Olof Johansson <olof@lixom.net>
Fri, 16 Dec 2011 06:02:11 +0000 (22:02 -0800)
committer Olof Johansson <olof@lixom.net>
Fri, 16 Dec 2011 06:02:11 +0000 (22:02 -0800)
diff --cc arch/arm/kernel/perf_event.c
Simple merge
diff --cc mm/vmalloc.c
Simple merge
author	Olof Johansson <olof@lixom.net>
	Fri, 16 Dec 2011 06:02:11 +0000 (22:02 -0800)
committer	Olof Johansson <olof@lixom.net>
	Fri, 16 Dec 2011 06:02:11 +0000 (22:02 -0800)
		1	2
arch/arm/kernel/perf_event.c	patch \|	diff1 \|	diff2 \|	blob \| history
mm/vmalloc.c	patch \|	diff1 \|	diff2 \|	blob \| history