]> pilppa.com Git - linux-2.6-omap-h63xx.git/commit
Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzi...
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 14 Apr 2008 14:57:07 +0000 (07:57 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 14 Apr 2008 14:57:07 +0000 (07:57 -0700)
commit1018cf9b0f27646c37a52a079989dc0552b2451c
treede2ae50bc8db908b170bd2375ed5b007f416ad93
parent533bb8a4d7388686243c37a414c4448ba3566f8a
parent1892225f788a73beae2ec26f6f2fa4cd2e5868d0
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