Merge branch 'omap/soc' into next/soc
commit017c899c2db3da481cc174049e47307ed3aba530
authorOlof Johansson <olof@lixom.net>
Fri, 16 Dec 2011 06:02:11 +0000 (15 22:02 -0800)
committerOlof Johansson <olof@lixom.net>
Fri, 16 Dec 2011 06:02:11 +0000 (15 22:02 -0800)
treed2e55932579421d0196ac63c45bad1de8dbfa5eb
parentdc47ce90c3a822cd7c9e9339fe4d5f61dcb26b50
parentc97136307c2cd336a3ee68cc0890b0f55d01d2d4
Merge branch 'omap/soc' into next/soc
arch/arm/kernel/perf_event.c
mm/vmalloc.c