Merge branch 'fix' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6
authorRussell King <rmk@dyn-67.arm.linux.org.uk>
Mon, 23 Mar 2009 16:42:30 +0000 (16:42 +0000)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Mon, 23 Mar 2009 16:42:30 +0000 (16:42 +0000)
commitdc85ce155b7cad4c39c1fc95b4f6281920cef3c8
tree5b7b353f9dbd6590493eb33f405e4ac8524b90e0
parent4731f8b66dd34ebf0e67ca6ba9162b0e509bec06
parent1efb71809fd47bc19b3ce05080e1d5085a8dfab1
Merge branch 'fix' of git://git./linux/kernel/git/ycmiao/pxa-linux-2.6
drivers/video/pxafb.c