Merge branch 'for_rmk' of git://git.mnementh.co.uk/linux-2.6-im
Merge branch 'pxa-eseries' into pxa-machines Conflicts: arch/arm/mach-pxa/Makefile
Showing
arch/arm/mach-pxa/e330.c
0 → 100644
arch/arm/mach-pxa/e350.c
0 → 100644
arch/arm/mach-pxa/eseries.h
0 → 100644
想要评论请 注册 或 登录