summaryrefslogtreecommitdiff
path: root/drivers/ata/pata_macio.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-12-15 22:14:41 (GMT)
committerLinus Torvalds <torvalds@linux-foundation.org>2011-12-15 22:14:41 (GMT)
commitf242bbc598b96f58ca4caf416cabe3ac01e8b2ab (patch)
tree118b7d94f2b2c5486212f80e0ea060dd90de1044 /drivers/ata/pata_macio.c
parentddf5a25c5fdd4cc276edf451871c38002eec0f95 (diff)
parent02a551c9755b799579e0a093bcc99b80b4dc1453 (diff)
downloadlinux-fsl-qoriq-f242bbc598b96f58ca4caf416cabe3ac01e8b2ab.tar.xz
Merge branch 'usb-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb
* 'usb-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb: USB: option: Removing one bogus and adding some new Huawei combinations USB: cdc-acm: add IDs for Motorola H24 HSPA USB module. usb: option: Add Huawei E398 controlling interfaces usb: renesas_usbhs: add hcd->has_tt for low/full speed usb: renesas_usbhs: typofix: irq_dtch control DTCHE usb: gadget: storage: release superspeed descriptors.
Diffstat (limited to 'drivers/ata/pata_macio.c')
0 files changed, 0 insertions, 0 deletions