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>
Tue, 23 Mar 2010 08:18:25 +0000 (08:18 +0000)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Tue, 23 Mar 2010 08:18:25 +0000 (08:18 +0000)
commit4f4669ee732a6b37279e912af1833fbff15407a2
tree305e4bdb5fb5473d44425dec562b21e3b3d5c375
parent48edcfcfbfcb3ffa76539f237b5527b62d72133a
parente3396b263c6a8f086a99f1d524272ff409d66de0
Merge branch 'fix' of git://git./linux/kernel/git/ycmiao/pxa-linux-2.6