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>
Thu, 30 Jul 2009 09:46:12 +0000 (10:46 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Thu, 30 Jul 2009 09:46:12 +0000 (10:46 +0100)
commit5dbc80f69e131ecca42a5958b7785a57851c80d7
tree8de1ab7fbea2a342dd023ea836c570c7a95ef764
parent3ef7143d2287b21e09e00a25a8cb4fbdcf0c6c4c
parent1d3e216f1d303878d7204de94dee251bc2702175
Merge branch 'fix' of git://git./linux/kernel/git/ycmiao/pxa-linux-2.6