Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

U

uboot-i9100
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Releases
- Model registry
- Environments
- Incidents

Snippets Groups Projects

1f155484

Commit 1f155484 authored 16 years ago by Wolfgang Denk

Downloads
- Plain Diff

Merge branch 'master' of /home/wd/git/u-boot/custodians


Conflicts:

	include/configs/socrates.h

Signed-off-by: Wolfgang Denk <wd@denx.de>

parents 791e1dba c918261c

No related branches found

No related tags found

Loading

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

common/usb.c 22 additions, 22 deletions

common/usb.c
common/usb_kbd.c 6 additions, 5 deletions

common/usb_kbd.c
common/usb_storage.c 10 additions, 18 deletions

common/usb_storage.c
drivers/usb/usb_ohci.c 3 additions, 3 deletions

drivers/usb/usb_ohci.c
include/configs/socrates.h 6 additions, 0 deletions

include/configs/socrates.h

with 47 additions and 48 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