Russell King 938c0ace3f Merge branch 'devel' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6 into devel-stable ... Conflicts: arch/arm/mach-pxa/tosa.c		2011-03-26 10:03:03 +00:00
..
mach	Merge branch 'devel' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6 into devel-stable	2011-03-26 10:03:03 +00:00