diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-09-04 17:06:36 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-09-04 17:06:36 +1000 |
| commit | e31ca171aebb704d4d843fec816a4cd5b342fe42 (patch) | |
| tree | 57ab19f34c7c01e2d20e095b5fdb18b2d1917f54 /drivers/usb/serial/usb-serial.c | |
| parent | 750bbeea59a313240b12f0b3281228492a550274 (diff) | |
| parent | 0291d9328b5c57785aee6793086a6d574e6e7810 (diff) | |
Merge branch 'quilt/driver-core'
Conflicts:
drivers/base/class.c
init/main.c
Diffstat (limited to 'drivers/usb/serial/usb-serial.c')
0 files changed, 0 insertions, 0 deletions