Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx
commit1b5e2a7e23439c13f73cacab1cf227f30cb9ae9f
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 20 May 2008 21:28:34 +0000 (20 14:28 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 20 May 2008 21:28:34 +0000 (20 14:28 -0700)
treebd9245e0d623558a820ae6a33c718a350c60c95d
parent737b0fbf448306975267509e6c6a074885ddb43c
parenteccf2144e1232c33a8235033ffa079b6ebf92faf
Merge branch 'fixes' of git://git./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
MAINTAINERS