| commit | cb7fabcf9d4340b61f012cc7e8e3d7ff5c4f441c | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@g5.osdl.org> | Sat Oct 21 13:41:41 2006 -0700 |
| committer | Linus Torvalds <torvalds@g5.osdl.org> | Sat Oct 21 13:41:41 2006 -0700 |
| tree | f8ffc30b8d1210237051408f71ef2b1dcbb4c0c1 | |
| parent | dcf234f3b0cbc4d2b73f5ee02405b117c5d77fbd [diff] | |
| parent | 8eb166bf805cc1c1d38d57211e8737631376b9ba [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: [PATCH] libata-sff: Allow for wacky systems [PATCH] ahci: readability tweak [PATCH] libata: typo fix [PATCH] ATA must depend on BLOCK [PATCH] libata: use correct map_db values for ICH8