projects / openwrt / staging / blogic.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(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)
commit7a5ac8def9e0c77803c302b63c3f29e31a610415
tree510f558d44a3c10ed4acdeb9bd09e81e775a429etree | snapshot
parent1be62dc190ebaca331038962c873e7967de6cc4bcommit | diff
parent8243e636c060fe7c10c9cf3bf53fdd2d48901525commit | diff
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()
John Crispins staging tree