]> err.no Git - linux-2.6/commitdiff
Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 20 May 2008 21:28:34 +0000 (14:28 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 20 May 2008 21:28:34 +0000 (14:28 -0700)
* '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

1  2 
MAINTAINERS

diff --cc MAINTAINERS
Simple merge