diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-08-03 18:08:13 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-08-03 18:08:13 +1000 |
| commit | df207d92613970bbf657563863fa5d1189e7e465 (patch) | |
| tree | 2206aee55fd0203c3b30cc1667762074932200e4 /drivers/staging/epl/user/EplTimeru.h | |
| parent | cdcc164fdfa45cfbc6ceefd0db662cb8595d0273 (diff) | |
| parent | 8225884b913bfa7540a0c5952609f2a939278ce0 (diff) | |
Merge branch 'quilt/usb'
Conflicts:
drivers/usb/gadget/m66592-udc.c
drivers/usb/host/r8a66597-hcd.c
Diffstat (limited to 'drivers/staging/epl/user/EplTimeru.h')
0 files changed, 0 insertions, 0 deletions