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)
commit76962be8491b18ae7ff4fd6a4accd398bdb402a2
tree976958bf8e4989a69901bfbb25dd6463728c6cb5
parent5e27fb78df95e027723af2c90ecc9b4527ae59e9
parentd30e5d897c3da7c2d17c8112331b66ed953eec78
Merge branch 'fix' of git://git./linux/kernel/git/ycmiao/pxa-linux-2.6
arch/arm/mach-ux500/clock.c