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>
Sat, 25 Sep 2010 09:27:50 +0000 (10:27 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Sat, 25 Sep 2010 09:27:50 +0000 (10:27 +0100)
commitf933b87e6f06fcce5988fd5e8ebf3a97858a7155
treeeb334347814e930bd0fd39b2f8291655280a597c
parent2f27bf834e1d0a06e83d7458b535891c552271aa
parentd42028060dfe1b9b65a387a849e82fd5c86359fb
Merge branch 'fix' of git://git./linux/kernel/git/ycmiao/pxa-linux-2.6