summaryrefslogtreecommitdiffstats
path: root/drivers/ata
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-06-20 21:41:10 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2008-06-20 21:41:10 +0200
commitd5545fa0056ff2982f8a6419bd9a6ba2674deefd (patch)
treef6f4eb4b1d7a4b3b65b2ae58c993bc456facfb45 /drivers/ata
parentMerge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/... (diff)
parentieee1394: Kconfig menu touch-up (diff)
downloadlinux-d5545fa0056ff2982f8a6419bd9a6ba2674deefd.tar.xz
linux-d5545fa0056ff2982f8a6419bd9a6ba2674deefd.zip
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: Kconfig menu touch-up firewire: Kconfig menu touch-up firewire: deadline for PHY config transmission firewire: fw-ohci: unify printk prefixes firewire: fill_bus_reset_event needs lock protection firewire: fw-ohci: write selfIDBufferPtr before LinkControl.rcvSelfID firewire: fw-ohci: disable PHY packet reception into AR context firewire: fw-ohci: use of uninitialized data in AR handler firewire: don't panic on invalid AR request buffer
Diffstat (limited to 'drivers/ata')
0 files changed, 0 insertions, 0 deletions