| commit | fa0cfc202c4969ceed567b1567c2e5effe7fd28b | |
| author | Linus Torvalds <torvalds@linux-foundation.org> | |
| Sat, 15 Nov 2008 19:33:05 +0000 (15 11:33 -0800) | ||
| committer | Linus Torvalds <torvalds@linux-foundation.org> | |
| Sat, 15 Nov 2008 19:33:05 +0000 (15 11:33 -0800) | ||
| tree | a6b23ec91fdf7f140f72cfc6aaf9b5cab342ae7b | treesnapshot (tar.gz zip) |
| parent | 8141c7f3e7aee618312fa1c15109e1219de784a7 | commitdiff |
| parent | 6a6b97d360702b98c02c7fca4c4e088dcf3a2985 | commitdiff |
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: improve phantom device detection
* 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev:
libata: improve phantom device detection