aboutsummaryrefslogtreecommitdiff
path: root/drivers/block/ub.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-02-09 10:25:38 -0800
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-02-09 10:25:38 -0800
commit64106104dd2d4a6280777e88c1cbf9f7a52c30bd (patch)
tree082ed0f5e8be5390e867e4078e6813c509c5e642 /drivers/block/ub.c
parentbeda9f3a13bbb22cde92a45f230a02ef2afef6a9 (diff)
parent91efa462054d44ae52b0c6c8325ed5e899f2cd17 (diff)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6: ieee1394: fix host device registering when nodemgr disabled ieee1394: video1394: DMA fix ieee1394: raw1394: prevent unloading of low-level driver ieee1394: dv1394: tidy up card removal ieee1394: dv1394: fix CardBus card ejection ieee1394: sbp2: lower block queue alignment requirement ieee1394: sbp2: remove bogus "emulated" host flag ieee1394: save one word in struct hpsb_host ieee1394: restore config ROM when resuming ieee1394: ohci1394: drop pcmcia-cs compatibility code ieee1394: nodemgr: check info_length in ROM header earlier the scheduled IEEE1394_OUI_DB removal the scheduled IEEE1394_EXPORT_FULL_API removal ieee1394: sbp2: use a better wildcard for blacklist Add PCI class ID for firewire OHCI controllers. ieee1394: modified csr1212_key_id_type_map to support lisight
Diffstat (limited to 'drivers/block/ub.c')
0 files changed, 0 insertions, 0 deletions