Merge branch 'fix' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux...
authorEric Miao <eric.miao@marvell.com>
Mon, 23 Mar 2009 01:55:09 +0000 (09:55 +0800)
committerEric Miao <eric.miao@marvell.com>
Mon, 23 Mar 2009 01:55:14 +0000 (09:55 +0800)
commitfa12868e59f5f49bc42b8befd94c531bb07ec120
tree25984e5d3941f37a72a5cd4ef8a6bafcaccc86a3
parentcefdb2a4436ec83b4c8b349aa30f976d30c22e25
parent1efb71809fd47bc19b3ce05080e1d5085a8dfab1
Merge branch 'fix' of git://git./linux/kernel/git/ycmiao/pxa-linux-2.6.git into devel
arch/arm/mach-pxa/e740.c
arch/arm/mach-pxa/e750.c
arch/arm/mach-pxa/e800.c
arch/arm/mach-pxa/tosa.c
drivers/video/pxafb.c