diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-02-26 18:25:30 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-02-26 18:25:30 +1100 |
| commit | 190e8cfcb9ac7ae9bbf6b7f54450292f365727dc (patch) | |
| tree | 91e0b6f713cda5626c7cc404be6df0565c926f3b /drivers/staging/ramzswap/xvmalloc.c | |
| parent | 3f9e6d112f513ba4511762f3a6cb38e010f7af9a (diff) | |
| parent | e4fd7e3d0c07d63b61fda3a66812982364341a50 (diff) | |
Merge branch 'quilt/usb'
Conflicts:
arch/arm/mach-mx2/devices.c
arch/arm/mach-mx2/devices.h
drivers/usb/early/ehci-dbgp.c
Diffstat (limited to 'drivers/staging/ramzswap/xvmalloc.c')
0 files changed, 0 insertions, 0 deletions