Merge branch 'fix' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6
commit819c1a651fec6b370211609ce6eceefd20cf31e4
authorRussell King <rmk+kernel@arm.linux.org.uk>
Sun, 12 Dec 2010 23:45:39 +0000 (12 23:45 +0000)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Sun, 12 Dec 2010 23:45:39 +0000 (12 23:45 +0000)
treeabfe2a3c84e4987f71ea9b71a0bc771c2c7f2a50
parent440e2e4759805437f89f7eda78de72cb46729d04
parent9f1ee150fc7039eb65039ab17d9a95dfa6250133
Merge branch 'fix' of git://git./linux/kernel/git/ycmiao/pxa-linux-2.6