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 Oct 2008 14:26:45 +0000 (14:26 +0000)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Thu, 30 Oct 2008 14:26:45 +0000 (14:26 +0000)
commit05cd2544f4b64d9a9eca0d170191867495e01feb
tree10146fb79bba464bac6f620d03b8cd50285065b7
parent27f680adc65ca08bf72ed85d3a48d1ee70f77c7a
parenta0601c8944dc08c2d349c24bd9c0b09c406229fc
Merge branch 'fix' of git://git./linux/kernel/git/ycmiao/pxa-linux-2.6