diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-04-03 14:45:57 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-04-03 14:45:57 +1100 |
| commit | 0c121f0423ee455d0cc48cb84461db220724a70e (patch) | |
| tree | 534a2d6c732856ef4db420b27ca7223dc91f8e40 | |
| parent | ef85bcfe3b5df6751098f8215f79f1010a9da5e6 (diff) | |
| parent | 3b18cb140431d454d3c2428b480ef2f656b0631d (diff) | |
Merge branch 'quilt/usb'
Conflicts:
arch/arm/mach-gemini/include/mach/vmalloc.h
0 files changed, 0 insertions, 0 deletions