summaryrefslogtreecommitdiff
path: root/block/cfq-iosched.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-07-02 19:29:16 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2008-07-02 19:29:16 -0700
commitc461a973118346d5c103aaaddd62e53939fd7c67 (patch)
treeb5380500612993dc05c89d659fe91ec6d028269b /block/cfq-iosched.c
parent9ad4107ba137f743fc531f9f4ceb81b122f9ff25 (diff)
parenta13307cef8bf51990ef1d525b1cbdcc2cfe07e2a (diff)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6: PCI: acpiphp: cleanup notify handler on all root bridges PCI: Limit VPD read/write lengths for Broadcom 5706, 5708, 5709 rev. PCI: Restrict VPD read permission to root
Diffstat (limited to 'block/cfq-iosched.c')
0 files changed, 0 insertions, 0 deletions