]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'next/pm' into for-next
authorArnd Bergmann <arnd@arndb.de>
Fri, 16 Dec 2011 15:44:57 +0000 (15:44 +0000)
committerArnd Bergmann <arnd@arndb.de>
Fri, 16 Dec 2011 15:44:57 +0000 (15:44 +0000)
1  2 
arch/arm/mach-omap2/Kconfig
arch/arm/mach-omap2/Makefile
arch/arm/mach-omap2/common.h
arch/arm/mach-omap2/io.c
arch/arm/plat-omap/sram.c

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge