Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzi...
commitfa0cfc202c4969ceed567b1567c2e5effe7fd28b
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 15 Nov 2008 19:33:05 +0000 (15 11:33 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 15 Nov 2008 19:33:05 +0000 (15 11:33 -0800)
treea6b23ec91fdf7f140f72cfc6aaf9b5cab342ae7b
parent8141c7f3e7aee618312fa1c15109e1219de784a7
parent6a6b97d360702b98c02c7fca4c4e088dcf3a2985
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