From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 28 Sep 2010 19:38:52 +0000 (-0700)
Subject: Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzi... 
X-Git-Tag: v2.6.36-rc6~3
X-Git-Url: http://bbs.cooldavid.org/git/?a=commitdiff_plain;h=7268e3c4b5eb8e3206a467d664c6e17773f2d19e;hp=-c;p=net-next-2.6.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:
  ahci: fix module refcount breakage introduced by libahci split
---

7268e3c4b5eb8e3206a467d664c6e17773f2d19e