Merge branch 'devel-timer' into devel-cleanup
authorTony Lindgren <tony@atomide.com>
Wed, 29 Jun 2011 10:35:18 +0000 (03:35 -0700)
committerTony Lindgren <tony@atomide.com>
Wed, 29 Jun 2011 10:35:18 +0000 (03:35 -0700)
commit332acd9e534e0bc8713d2cb90dd2d4d5f2485401
tree8627f57b3c43f3612c91760292f7e7d1b47eb3d1
parentbafe2721a0fbd1cc1af04384133684f660f3658e
parent0f622e8cae379ee17e1ffe867336b74c5b16f958
Merge branch 'devel-timer' into devel-cleanup
14 files changed:
arch/arm/mach-omap2/board-4430sdp.c
arch/arm/mach-omap2/board-cm-t35.c
arch/arm/mach-omap2/board-cm-t3517.c
arch/arm/mach-omap2/board-devkit8000.c
arch/arm/mach-omap2/board-igep0020.c
arch/arm/mach-omap2/board-ldp.c
arch/arm/mach-omap2/board-omap3beagle.c
arch/arm/mach-omap2/board-omap3evm.c
arch/arm/mach-omap2/board-omap3logic.c
arch/arm/mach-omap2/board-omap3pandora.c
arch/arm/mach-omap2/board-omap3stalker.c
arch/arm/mach-omap2/board-omap3touchbook.c
arch/arm/mach-omap2/board-omap4panda.c
arch/arm/mach-omap2/board-overo.c