Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzi...
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 28 Sep 2010 19:38:52 +0000 (12:38 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 28 Sep 2010 19:38:52 +0000 (12:38 -0700)
* 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev:
  ahci: fix module refcount breakage introduced by libahci split


Trivial merge