Merge branch 'musb' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux...
Olof Johansson [Fri, 16 Dec 2011 05:21:08 +0000 (21:21 -0800)]
1  2 
arch/arm/kernel/perf_event.c
mm/vmalloc.c

Simple merge
diff --cc mm/vmalloc.c
Simple merge