]> pilppa.com Git - linux-2.6-omap-h63xx.git/commit
Merge branch 'omap-clock-fixes' of git://git.pwsan.com/linux-2.6 master
authorTony Lindgren <tony@atomide.com>
Fri, 10 Apr 2009 19:03:31 +0000 (12:03 -0700)
committerTony Lindgren <tony@atomide.com>
Fri, 10 Apr 2009 19:03:31 +0000 (12:03 -0700)
commit12323321f004c9e83061c9a9d06046b050d6d4c7
tree0f816c08d7867c2e22847c0327f5d65567ed6412
parent4311ae5aa39c5cb942afc4d4e2a1a08e8d2b0d04
parent5f151be8387a63e60a2bbd2a61f2d2561c70532c
Merge branch 'omap-clock-fixes' of git://git.pwsan.com/linux-2.6

Conflicts:
arch/arm/mach-omap2/board-omap3beagle.c
arch/arm/mach-omap2/board-omap3beagle.c