]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'next/pm' into for-next
authorOlof Johansson <olof@lixom.net>
Mon, 12 Dec 2011 00:03:00 +0000 (16:03 -0800)
committerOlof Johansson <olof@lixom.net>
Mon, 12 Dec 2011 00:03:00 +0000 (16:03 -0800)
1  2 
arch/arm/plat-omap/sram.c

Simple merge