diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-04-29 16:22:22 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-04-29 16:22:22 +1000 |
| commit | 97d50e390054d387d798ba78bb6bb6d8d703c5ed (patch) | |
| tree | 41a23b3ebe39fdb5cb0633ee18abafcefcefc870 /drivers/watchdog/iTCO_wdt.c | |
| parent | 37a86c22be01df315deba23fe340294bce290455 (diff) | |
| parent | a9a6bc7210e798e7f82b994566db906da5b3480d (diff) | |
Merge branch 'quilt/usb'
Conflicts:
drivers/usb/serial/sierra.c
Diffstat (limited to 'drivers/watchdog/iTCO_wdt.c')
0 files changed, 0 insertions, 0 deletions