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>
Fri, 8 Jan 2010 16:18:37 +0000 (16:18 +0000)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Fri, 8 Jan 2010 16:18:37 +0000 (16:18 +0000)
commit0de9a00fd6e0a137c63fbbfb6012bf34cc0ab7c4
treebda182d9407e32354620e9188258c86cad2e3813
parent22325525d8bb1478daddefec1b762e7882bcd515
parentd13fecd0293d55a4bcb8a31078216504192d8ce0
Merge branch 'fix' of git://git./linux/kernel/git/ycmiao/pxa-linux-2.6