-
- Downloads
Merge branch 'devel' of...
Merge branch 'devel' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6 into devel-stable Conflicts: arch/arm/mach-pxa/tosa.c
Showing
- arch/arm/include/asm/mach/udc_pxa2xx.h 0 additions, 2 deletionsarch/arm/include/asm/mach/udc_pxa2xx.h
- arch/arm/mach-pxa/am200epd.c 4 additions, 4 deletionsarch/arm/mach-pxa/am200epd.c
- arch/arm/mach-pxa/am300epd.c 7 additions, 6 deletionsarch/arm/mach-pxa/am300epd.c
- arch/arm/mach-pxa/balloon3.c 1 addition, 1 deletionarch/arm/mach-pxa/balloon3.c
- arch/arm/mach-pxa/cm-x2xx.c 1 addition, 1 deletionarch/arm/mach-pxa/cm-x2xx.c
- arch/arm/mach-pxa/cm-x300.c 1 addition, 1 deletionarch/arm/mach-pxa/cm-x300.c
- arch/arm/mach-pxa/colibri-pxa270-income.c 1 addition, 1 deletionarch/arm/mach-pxa/colibri-pxa270-income.c
- arch/arm/mach-pxa/colibri-pxa3xx.c 1 addition, 1 deletionarch/arm/mach-pxa/colibri-pxa3xx.c
- arch/arm/mach-pxa/corgi.c 0 additions, 1 deletionarch/arm/mach-pxa/corgi.c
- arch/arm/mach-pxa/devices.c 2 additions, 7 deletionsarch/arm/mach-pxa/devices.c
- arch/arm/mach-pxa/em-x270.c 1 addition, 1 deletionarch/arm/mach-pxa/em-x270.c
- arch/arm/mach-pxa/eseries.c 27 additions, 9 deletionsarch/arm/mach-pxa/eseries.c
- arch/arm/mach-pxa/ezx.c 6 additions, 6 deletionsarch/arm/mach-pxa/ezx.c
- arch/arm/mach-pxa/gumstix.c 11 additions, 2 deletionsarch/arm/mach-pxa/gumstix.c
- arch/arm/mach-pxa/idp.c 1 addition, 1 deletionarch/arm/mach-pxa/idp.c
- arch/arm/mach-pxa/include/mach/palmz72.h 5 additions, 0 deletionsarch/arm/mach-pxa/include/mach/palmz72.h
- arch/arm/mach-pxa/include/mach/pxafb.h 2 additions, 2 deletionsarch/arm/mach-pxa/include/mach/pxafb.h
- arch/arm/mach-pxa/include/mach/z2.h 1 addition, 2 deletionsarch/arm/mach-pxa/include/mach/z2.h
- arch/arm/mach-pxa/littleton.c 1 addition, 1 deletionarch/arm/mach-pxa/littleton.c
- arch/arm/mach-pxa/lpd270.c 1 addition, 1 deletionarch/arm/mach-pxa/lpd270.c
Loading
Please register or sign in to comment