]> pilppa.com Git - linux-2.6-omap-h63xx.git/commit
Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzi...
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Sun, 24 Feb 2008 05:40:32 +0000 (21:40 -0800)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Sun, 24 Feb 2008 05:40:32 +0000 (21:40 -0800)
commit4fa2b1cde0e3797549f711ce9e51c395b3d6d2a7
tree312e07715c088d4ed1e79b9b18b1d52e3b585ca9
parentbdc08942897f6be33d00bb659761516f4652836d
parent4cdfa1b3ce4731dd538ac3ed010bcf127ed6e836
Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev

* 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev:
  libata-core: fix kernel-doc warning
  sata_fsl: fix build with ATA_VERBOSE_DEBUG
  [libata] ahci: AMD SB700/SB800 SATA support 64bit DMA
  libata-pmp: clear hob for pmp register accesses
  libata: automatically use DMADIR if drive/bridge requires it
  power_state: get rid of write-only variable in SATA
  pata_atiixp: Use 255 sector limit