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>
Wed, 21 Jul 2010 08:26:37 +0000 (09:26 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Wed, 21 Jul 2010 08:26:37 +0000 (09:26 +0100)
commit52d90145fb8bb52228bf7273cbccae4530203758
tree8346874ca7d4c4418552ee9941777d349d1594b3
parentf4b23cc2d5dc78ef5acbc529eb1219cc41eb5b96
parent59376cc355ebe1dc89c9daea49010b8b171af404
Merge branch 'fix' of git://git./linux/kernel/git/ycmiao/pxa-linux-2.6