diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-08-04 17:14:20 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-08-04 17:14:20 +1000 |
| commit | 15b0a180dee145b0094486c3c6e26fc3d248fa7f (patch) | |
| tree | 92501e768195c4e9ef007c232acee0e2598d2a45 /drivers/staging/pata_rdc/pata_rdc.c | |
| parent | 0202fb7c79ec49749f285f18abcf450df0f2954d (diff) | |
| parent | e2959a91ca0522c9a3497e27e9d1b5d96f31432b (diff) | |
Merge branch 'quilt/usb'
Conflicts:
drivers/usb/gadget/m66592-udc.c
drivers/usb/host/r8a66597-hcd.c
Diffstat (limited to 'drivers/staging/pata_rdc/pata_rdc.c')
0 files changed, 0 insertions, 0 deletions