]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Sat, 20 Oct 2007 03:34:29 +0000 (20:34 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Sat, 20 Oct 2007 03:34:29 +0000 (20:34 -0700)
commiteec848b1118bd13c7eb28e0db7261cef1291bee5
treef4244162d7f1f55ebbe53a717a47ef81988976b2
parentfbd2c8c5d4ceb71fe5307aedf31e4ee8dab3380a
parent3e0a50a3507682a37cf853165622ae78771860a4
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:
  [libata] sata_sis: use correct S/G table size
  pata_cs5536: MWDMA fix
  sata_sis: fix SCR read breakage
  libata: fix kernel-doc param name