projects / linux-2.6 / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: d973664 f7e9893)
Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzi...
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 29 Apr 2008 22:19:09 +0000 (15:19 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 29 Apr 2008 22:19:09 +0000 (15:19 -0700)
commitc65a3500b2947d344862da8cce626b7cc7ec5758
tree5ba65501a50ab4b7373cba665357797044750930tree | snapshot
parentd973664992d814d93db161b28c0cc9a4c7e68f42commit | diff
parentf7e989301b6c232dec5489e94ee7741c85cb11bacommit | 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:
  [libata] linux/libata.h: reorganize ata_device struct members a bit
  ahci: SB600 ahci can't do MSI, blacklist that capability
  libata: More TSSTcorp pain, keep in sync with legacy IDE
  pata_via: Fix 6410 misdetect
  [libata] pata_atiixp: fix PIO timing data misprogramming
Making Linux better for my computers