]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'next/pm' into for-next
authorOlof Johansson <olof@lixom.net>
Tue, 20 Dec 2011 05:17:27 +0000 (21:17 -0800)
committerOlof Johansson <olof@lixom.net>
Tue, 20 Dec 2011 05:17:27 +0000 (21:17 -0800)
1  2 
arch/arm/mach-omap2/Makefile
arch/arm/mach-omap2/board-4430sdp.c

Simple merge
Simple merge