tree f9b8ea6bf9fe3fc395ff9b46a865b9ee459e239a
parent 432409eebcdec38ff6fa949f097b5438d588faa5
parent 3a9e3a51dd47bd9e2fd6bcf3c893eb5729c6f1ee
author Linus Torvalds <torvalds@woody.linux-foundation.org> 1193190981 -0700
committer Linus Torvalds <torvalds@woody.linux-foundation.org> 1193190981 -0700

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:
  jmicron: update quirk for JMB361/3/5/6
  libata: add HTS542525K9SA00 to NCQ blacklist
  libata-core: auditting chk_status v check_status
  [libata] checkpatch-inspired cleanups