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>
Sun, 7 Nov 2010 16:11:20 +0000 (16:11 +0000)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Sun, 7 Nov 2010 16:11:20 +0000 (16:11 +0000)
commit261ca205817deb3d3dfd0be218cc0154be8e6472
tree6f1e6671e751db90c196ecf4ef0a3041081f308d
parent725278e0ecdabbbced6f1b05a23473ec9e4cafee
parent72feb6e7cb55e7947653446e52e54d66134ac1b5
Merge branch 'fix' of git://git./linux/kernel/git/ycmiao/pxa-linux-2.6