Russell King 40321fd21c Merge branch 'for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6 into devel ... Conflicts: arch/arm/mach-pxa/am200epd.c arch/arm/mach-pxa/ezx.c		2008-12-23 18:06:37 +00:00
..
mach	Merge branch 'for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6 into devel	2008-12-23 18:06:37 +00:00