diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-09-17 11:32:55 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-09-17 11:32:55 +1000 |
| commit | cbd4cb044dafc2f2116bbc2fc686c7d2d9fb84c0 (patch) | |
| tree | 6a5ce17fd0ce8fa765c220d6bdd2b8037c25c3b3 /drivers/usb/gadget/gadget_chips.h | |
| parent | 01f4ab2fc22192c5a325b95419b46d2e0f040369 (diff) | |
| parent | 1e0d061b462e48f9b1609a29aed9a5abcf65833e (diff) | |
Merge commit 'parisc/next'
Conflicts:
arch/parisc/include/asm/thread_info.h
arch/parisc/kernel/entry.S
arch/parisc/kernel/signal.c
Diffstat (limited to 'drivers/usb/gadget/gadget_chips.h')
0 files changed, 0 insertions, 0 deletions