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)
1  2 
drivers/video/pxafb.c

Simple merge