Merge branch 'devel' of...
Merge branch 'devel' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6 into devel Conflicts: arch/arm/configs/magician_defconfig
Showing
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
arch/arm/mach-pxa/palmld.c
0 → 100644
This diff is collapsed.
arch/arm/mach-pxa/palmt5.c
0 → 100644
This diff is collapsed.
Please register or sign in to comment