Merge branch 'fix' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6
authorRussell King <rmk+kernel@arm.linux.org.uk>
Tue, 8 Jun 2010 18:40:08 +0000 (19:40 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Tue, 8 Jun 2010 18:40:08 +0000 (19:40 +0100)
1  2 
arch/arm/mach-ux500/clock.c

Simple merge