tree 2b935d680e2a2d65d679b8633d11529dae225c0f
parent b4d32648c190711177a664af7d51149a8950555e
parent fad16e7a7f67eef8d33f8ad58850db89382b09ce
author Linus Torvalds <torvalds@linux-foundation.org> 1285702732 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1285702732 -0700

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