| commit | 656ddf798dbe588217c97e58b9cfdfce649ebdc3 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@g5.osdl.org> | Mon Sep 25 19:32:02 2006 -0700 |
| committer | Linus Torvalds <torvalds@g5.osdl.org> | Mon Sep 25 19:32:02 2006 -0700 |
| tree | e02659c481b7beb61b9f63c88e4cd200a4369517 | |
| parent | 7e4720201ad44ace85a443f41d668a62a737e7d0 [diff] | |
| parent | 29da9f6d9cc3685ae7f6c8b817f6ed8864c78a4c [diff] |
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] Fix oops introduced in non-uniform port handling fix [PATCH] ata-piix: fixes kerneldoc error