Merge branch 'fix' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6
authorRussell King <rmk@dyn-67.arm.linux.org.uk>
Sat, 23 May 2009 10:16:05 +0000 (11:16 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Sat, 23 May 2009 10:16:05 +0000 (11:16 +0100)
commit355532bdda14a7162cee55fdd67600bf9bc9a152
tree96c6e79c22ba65a47685097460b8e0168a2ff431
parent2528ed119b8f4fc553f9d1e65719ae183ffa97f4
parent6ec04f434d29aed33608e0ca4d8b100190e71e96
Merge branch 'fix' of git://git./linux/kernel/git/ycmiao/pxa-linux-2.6