]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
projects / linux-2.6-omap-h63xx.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1be62dc 8243e63)
Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzi...
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 4 Apr 2008 21:40:04 +0000 (14:40 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 4 Apr 2008 21:40:04 +0000 (14:40 -0700)
* '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()


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.