Merge branch 'next/dmtimer' into for-next

author Arnd Bergmann <arnd@arndb.de>

Fri, 21 Oct 2011 14:41:35 +0000 (16:41 +0200)

committer Arnd Bergmann <arnd@arndb.de>

Fri, 21 Oct 2011 14:41:35 +0000 (16:41 +0200)
author Arnd Bergmann <arnd@arndb.de>
Fri, 21 Oct 2011 14:41:35 +0000 (16:41 +0200)
committer Arnd Bergmann <arnd@arndb.de>
Fri, 21 Oct 2011 14:41:35 +0000 (16:41 +0200)
diff --cc arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
Simple merge
author	Arnd Bergmann <arnd@arndb.de>
	Fri, 21 Oct 2011 14:41:35 +0000 (16:41 +0200)
committer	Arnd Bergmann <arnd@arndb.de>
	Fri, 21 Oct 2011 14:41:35 +0000 (16:41 +0200)