From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Wed, 24 Oct 2007 01:56:21 +0000 (-0700)
Subject: Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik... 
X-Git-Tag: v2.6.24-rc1~16
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=c09b360a2b0779e08bacb88d3fcd8458ebc49658;p=linux-2.6-omap-h63xx.git

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
---

c09b360a2b0779e08bacb88d3fcd8458ebc49658