Merge branch 'fix' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux...
commitef267500094632e0b8229e284e7295ef858da362
authorRussell King <rmk+kernel@arm.linux.org.uk>
Thu, 28 Apr 2011 14:30:45 +0000 (28 15:30 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Thu, 28 Apr 2011 14:30:45 +0000 (28 15:30 +0100)
tree46542e8580ee1cae2d75a816b049dafbfa457d38
parenta8d2518c2a7235f0b772c1f1bd30218130e631a7
parent83a5d2d1b4cc06ce17b44873e004fc0b55552183
Merge branch 'fix' of git://git./linux/kernel/git/ycmiao/pxa-linux-2.6 into fixes