From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 4 Apr 2008 21:40:04 +0000 (-0700)
Subject: Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzi... 
X-Git-Tag: v3.12-rc1~22142
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=7a5ac8def9e0c77803c302b63c3f29e31a610415;p=kernel%2Fkernel-generic.git

Merge branch 'upstream-linus' of git://git./linux/kernel/git/jgarzik/libata-dev

* 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev:
  pata_ali: disable ATAPI DMA
  libata: ATA_12/16 doesn't fall into ATAPI_MISC
  libata: uninline atapi_cmd_type()
  libata: fix IDENTIFY order in ata_bus_probe()
---

7a5ac8def9e0c77803c302b63c3f29e31a610415