Merge branch 'fix' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux...

author Eric Miao <[email protected]>

Mon, 23 Mar 2009 01:55:09 +0000 (09:55 +0800)

committer Eric Miao <[email protected]>

Mon, 23 Mar 2009 01:55:14 +0000 (09:55 +0800)
author Eric Miao <[email protected]>
Mon, 23 Mar 2009 01:55:09 +0000 (09:55 +0800)
committer Eric Miao <[email protected]>
Mon, 23 Mar 2009 01:55:14 +0000 (09:55 +0800)
diff --cc arch/arm/mach-pxa/e740.c
Simple merge
diff --cc arch/arm/mach-pxa/e750.c
Simple merge
diff --cc arch/arm/mach-pxa/e800.c
Simple merge
diff --cc arch/arm/mach-pxa/tosa.c
Simple merge
diff --cc drivers/video/pxafb.c
Simple merge
author	Eric Miao <[email protected]>
	Mon, 23 Mar 2009 01:55:09 +0000 (09:55 +0800)
committer	Eric Miao <[email protected]>
	Mon, 23 Mar 2009 01:55:14 +0000 (09:55 +0800)
		1	2
arch/arm/mach-pxa/e740.c	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-pxa/e750.c	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-pxa/e800.c	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-pxa/tosa.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/video/pxafb.c	patch \|	diff1 \|	diff2 \|	blob \| history