Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

X

xcap-capability-linux
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Releases
- Model registry
- Incidents
- Service Desk

Snippets Groups Projects

fb35f1ce

Commit fb35f1ce authored 14 years ago by Russell King

Downloads
- Plain Diff

Merge branch 'fix' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6

parents 8954bb0d cdb4acc0

No related branches found

No related tags found

Loading

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

arch/arm/include/asm/mach/udc_pxa2xx.h 2 additions, 2 deletions

arch/arm/include/asm/mach/udc_pxa2xx.h
arch/arm/mach-pxa/mioa701.c 1 addition, 1 deletion

arch/arm/mach-pxa/mioa701.c
arch/arm/mach-pxa/z2.c 10 additions, 16 deletions

arch/arm/mach-pxa/z2.c
arch/arm/plat-pxa/Makefile 2 additions, 1 deletion

arch/arm/plat-pxa/Makefile
drivers/power/z2_battery.c 3 additions, 9 deletions

drivers/power/z2_battery.c

with 18 additions and 29 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment