Russell King c5b84b3bb0 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/pxa25x.c		2008-12-02 22:07:40 +00:00
..
bootp
compressed	Merge branch 'for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6 into devel	2008-12-02 22:07:40 +00:00
.gitignore	[ARM] 4449/1: more entries in arch/arm/boot/.gitignore	2007-06-25 20:37:35 +01:00
install.sh
Makefile	[ARM] 4854/1: fix the load address of uImage for CONFIG_ZBOOT_ROM=y	2008-04-19 11:28:07 +01:00