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
This commit is contained in:
Russell King 2008-12-23 18:06:37 +00:00 • committed by Russell King
commit 40321fd21c
18 changed files with 1828 additions and 166 deletions