diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2010-12-22 15:25:34 -0500 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-12-22 15:25:34 -0500 |
| commit | 2af10844eb6ed104f9505bf3a7ba3ceb02264f31 (patch) | |
| tree | 8a00024ff525b22379ea90a78ac3222db5a73062 /include/linux/wl12xx.h | |
| parent | 73bc7d315f56e260071bdb5f15e25b53bddc1402 (diff) | |
| parent | 90a8a73c06cc32b609a880d48449d7083327e11a (diff) | |
USB: Merge 2.6.37-rc5 into usb-next
This is to resolve the conflict in the file,
drivers/usb/gadget/composite.c that was due to a revert in Linus's tree
needed for the 2.6.37 release.
Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'include/linux/wl12xx.h')
0 files changed, 0 insertions, 0 deletions