Merge branch 'omap-fixes-for-linus' into omap-for-linus
authorTony Lindgren <tony@atomide.com>
Thu, 11 Feb 2010 02:18:13 +0000 (18:18 -0800)
committerTony Lindgren <tony@atomide.com>
Thu, 11 Feb 2010 02:18:13 +0000 (18:18 -0800)
commit0482e3c6f704d25b6a4e3c940caeeacece4e6d74
treea8506b9b15ed9a31c2171fc7b461ef52453307b0
parent9ba874506b7b3883d78b8cad61eba39c4bb09885
parenta6c7fdd29350a74ba5f76809436de9c3d6763009
Merge branch 'omap-fixes-for-linus' into omap-for-linus
arch/arm/plat-omap/clock.c
arch/arm/plat-omap/omap_device.c