tree bd9245e0d623558a820ae6a33c718a350c60c95d
parent 737b0fbf448306975267509e6c6a074885ddb43c
parent eccf2144e1232c33a8235033ffa079b6ebf92faf
author Linus Torvalds <torvalds@linux-foundation.org> 1211318914 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1211318914 -0700

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