summaryrefslogtreecommitdiffstats
path: root/include/scsi/fc
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-05-15 21:04:37 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2009-05-15 21:04:49 +0200
commit8c21f34126222239450717b78dda0c4962d9ebfa (patch)
tree3ed64c828f8bf8896e684a6ae471ed56b926b0d8 /include/scsi/fc
parentMerge git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 (diff)
parentlibata: Media rotation rate and form factor heuristics (diff)
downloadlinux-8c21f34126222239450717b78dda0c4962d9ebfa.tar.xz
linux-8c21f34126222239450717b78dda0c4962d9ebfa.zip
Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev
* 'upstream-linus' of ssh://master.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev: libata: Media rotation rate and form factor heuristics libata: Report disk alignment and physical block size sata_fsl: Fix the command description of FSL SATA controller sata_fsl: Fix compile warnings [libata] sata_sx4: fixup interrupt handling [libata] sata_sx4: convert to new exception handling methods
Diffstat (limited to '')
0 files changed, 0 insertions, 0 deletions