summaryrefslogtreecommitdiff
path: root/drivers/telephony
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-02-02 20:14:48 +0300
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-02-02 20:14:48 +0300
commite47fddf2470feb228e1d3ff41fc78dad4cfbbcc6 (patch)
treebe16dc950dda26f44aaa09455879acbca7efbcae /drivers/telephony
parent222335b755726f539c4a056ce119e017aa4166c4 (diff)
parent49c8042996c84f0df6c49ea2e28a7ef38cd7d773 (diff)
downloadlinux-e47fddf2470feb228e1d3ff41fc78dad4cfbbcc6.tar.xz
Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev
* 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev: libata: Initialize nbytes for internal sg commands libata: Fix ata_busy_wait() kernel docs pata_via: Correct missing comments pata_atiixp: propogate cable detection hack from drivers/ide to the new driver ahci/pata_jmicron: fix JMicron quirk
Diffstat (limited to 'drivers/telephony')
0 files changed, 0 insertions, 0 deletions