]> rtime.felk.cvut.cz Git - can-eth-gw-linux.git/commitdiff
Merge branch 'omap-clock-fixes' into omap-fixes
authorTony Lindgren <tony@atomide.com>
Fri, 24 Apr 2009 16:56:16 +0000 (09:56 -0700)
committerTony Lindgren <tony@atomide.com>
Fri, 24 Apr 2009 16:56:16 +0000 (09:56 -0700)
1  2 
arch/arm/mach-omap2/timer-gp.c

Simple merge