summaryrefslogtreecommitdiffstats
path: root/init
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-09-20 13:25:35 -0700
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-09-20 13:25:35 -0700
commit335fb8fc71692830aca0a5a5fe7f60016ee0d0aa (patch)
tree909e8c07f953d7d81cc4daebfe937a95966d432b /init
parentb8fceee17a310f189188599a8fa5e9beaff57eb0 (diff)
parentc69c0892d8dd68b01a9fced5cab8527f0698c15e (diff)
downloadop-kernel-dev-335fb8fc71692830aca0a5a5fe7f60016ee0d0aa.zip
op-kernel-dev-335fb8fc71692830aca0a5a5fe7f60016ee0d0aa.tar.gz
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] ahci: add ATI SB800 PCI IDs libata-sff: Fix documentation libata: Update the blacklist with a few more devices
Diffstat (limited to 'init')
0 files changed, 0 insertions, 0 deletions
OpenPOWER on IntegriCloud