| commit | 1018cf9b0f27646c37a52a079989dc0552b2451c | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Mon Apr 14 07:57:07 2008 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Mon Apr 14 07:57:07 2008 -0700 |
| tree | de2ae50bc8db908b170bd2375ed5b007f416ad93 | |
| parent | 533bb8a4d7388686243c37a414c4448ba3566f8a [diff] | |
| parent | 1892225f788a73beae2ec26f6f2fa4cd2e5868d0 [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: [libata] make ali_atapi_dma static [libata] sata_svw: fix reversed port count