commit | 7268e3c4b5eb8e3206a467d664c6e17773f2d19e | [log] [tgz] |
---|---|---|
author | Linus Torvalds <torvalds@linux-foundation.org> | Tue Sep 28 12:38:52 2010 -0700 |
committer | Linus Torvalds <torvalds@linux-foundation.org> | Tue Sep 28 12:38:52 2010 -0700 |
tree | 2b935d680e2a2d65d679b8633d11529dae225c0f | |
parent | b4d32648c190711177a664af7d51149a8950555e [diff] | |
parent | fad16e7a7f67eef8d33f8ad58850db89382b09ce [diff] |
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