From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 15 Nov 2008 19:33:05 +0000 (-0800)
Subject: Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzi... 
X-Git-Tag: v2.6.28-rc5~14
X-Git-Url: http://www.pilppa.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=fa0cfc202c4969ceed567b1567c2e5effe7fd28b;hp=-c;p=linux-2.6-omap-h63xx.git

Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/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
---

fa0cfc202c4969ceed567b1567c2e5effe7fd28b