]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge branches 'next/driver', 'next/timer', 'next/voltage', 'next/dmtimer' and 'next...
authorArnd Bergmann <arnd@arndb.de>
Sat, 8 Oct 2011 19:57:16 +0000 (21:57 +0200)
committerArnd Bergmann <arnd@arndb.de>
Sat, 8 Oct 2011 19:57:16 +0000 (21:57 +0200)
commit86acabf2510f91bd4dbb71c3720d755b06ad966c
tree75b2723cd005eb471befc15aed9bfb242545431a
parentfef0157b3d43df97ea130e65109bb0b12f290c83
parenteff11ba9ebba475f2aedee74eebc459789f99ab6
parent4c23c8da96de1af7ed88ee5258af613e8c03c3ad
parent2558bd99cb1426a05ac8f1c78dc9c75a83ceb4bb
Merge branches 'next/driver', 'next/timer', 'next/voltage', 'next/dmtimer' and 'next/pm' into for-next
arch/arm/mach-omap2/io.c
arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
arch/arm/mach-omap2/pm.c
arch/arm/mach-omap2/sr_device.c
arch/arm/mach-prima2/timer.c