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, 1 Sep 2010 09:06:27 +0000 (10:06 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Wed, 1 Sep 2010 09:06:27 +0000 (10:06 +0100)
commit1fd317076caf1ee22ddb6a7853a0ca462f0233c5
tree09f657809faf866bb11c43d831b3bd45589e486d
parentca15f790e049f40951dc0d688084dd670df445a5
parentffb287c9daabc3734a92def0d59796f065ad29eb
Merge branch 'fix' of git://git./linux/kernel/git/ycmiao/pxa-linux-2.6