From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 20 May 2008 21:28:34 +0000 (-0700)
Subject: Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx
X-Git-Tag: v2.6.26-rc4~95
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=1b5e2a7e23439c13f73cacab1cf227f30cb9ae9f;p=~emulex%2Finfiniband.git

Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx

* 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx:
  iop-adma: fixup some kzalloc/memset confusions
  fsldma: update the fsldma driver MAINTAINERS info
---

1b5e2a7e23439c13f73cacab1cf227f30cb9ae9f