diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-02-22 17:11:10 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-02-22 17:11:10 -0800 |
| commit | c6ad121784b13760935b3374adcec2268ee31b99 (patch) | |
| tree | 0105bf7a892b43743872daab0364eb7f2fc921fb /fs/fifo.c | |
| parent | d8204a37baf5474d3154eb536c936369be2bd5c0 (diff) | |
| parent | 9ce4f80fb67b47b96c647ac6280a06dbd4bb50d2 (diff) | |
Merge branch 'usb-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6
* 'usb-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6:
Revert "USB: Reset USB 3.0 devices on (re)discovery"
USB: musb: omap2430: fix kernel panic on reboot
sierra: add new ID for Airprime/Sierra USB IP modem
USB: serial/usb_wwan, fix tty NULL dereference
USB: Reset USB 3.0 devices on (re)discovery
USB: Add quirk for Samsung Android phone modem
USB: Add Samsung SGH-I500/Android modem ID switch to visor driver
USB: add quirks entry for Keytouch QWERTY Panel
usb: musb: omap2430: fix kernel panic on reboot
usb: musb: fix build breakage
Diffstat (limited to 'fs/fifo.c')
0 files changed, 0 insertions, 0 deletions