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)
commit7268e3c4b5eb8e3206a467d664c6e17773f2d19e
tree2b935d680e2a2d65d679b8633d11529dae225c0f
parentb4d32648c190711177a664af7d51149a8950555e
parentfad16e7a7f67eef8d33f8ad58850db89382b09ce
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:
  ahci: fix module refcount breakage introduced by libahci split