summaryrefslogtreecommitdiff
path: root/fs/splice.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-04-02 15:56:18 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2008-04-02 15:56:18 -0700
commit9597362d354f8655ece324b01d0c640a0e99c077 (patch)
tree9f27a6a7d8def97721d6a8ad0a9c5c008bee7360 /fs/splice.c
parent06f11f37aa84e83b48cdf36037c4414f5a83c13f (diff)
parent9cebcdc7fb10d478b22d7125b215cee3b9ea82f2 (diff)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6: USB: ohci: fix 2 timers to fire at jiffies + 1s USB: Allow initialization of broken keyspan serial adapters. USB: fix bug in sg initialization in usbtest USB: serial: fix regression in Visor/Palm OS module for kernels >= 2.6.24 USB: cp2101: Add identifiers for the Telegesys ETRX2USB USB: serial: ti_usb_3410_5052: Correct TUSB3410 endpoint requirements. USB: another ehci_iaa_watchdog fix
Diffstat (limited to 'fs/splice.c')
0 files changed, 0 insertions, 0 deletions