summaryrefslogtreecommitdiffstats
path: root/arch/sh/drivers/dma/dma-api.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2008-02-14 21:30:22 -0800
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2008-02-14 21:30:22 -0800
commit4ee29f6a52158cea526b16a44ae38643946103ec (patch)
treee439df35a39c06df3665ec30b406406f08e82177 /arch/sh/drivers/dma/dma-api.c
parent4e3d0319451805cffa69bdb1352f1c9817bf28bc (diff)
parent5906a0448208024d140e1ee0e65f9168a405fb94 (diff)
downloadlinux-4ee29f6a52158cea526b16a44ae38643946103ec.tar.gz
linux-4ee29f6a52158cea526b16a44ae38643946103ec.tar.bz2
linux-4ee29f6a52158cea526b16a44ae38643946103ec.zip
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid: HID: add USB IDs for MacBook 3rd generation HID: add LCSPEC from VERNIER to quirk list HID: fix processing of event quirks HID: Blacklist new GTCO CalComp USB device PIDs
Diffstat (limited to 'arch/sh/drivers/dma/dma-api.c')
0 files changed, 0 insertions, 0 deletions