Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1...
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 15 Aug 2011 15:40:49 +0000 (08:40 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 15 Aug 2011 15:40:49 +0000 (08:40 -0700)
commit6f02bfc404decf5b5046f1413ef941e1870912f7
tree8d3ef4ebba507a3d3f2e491d25dcd51c7241a401
parenta0b3447fb1d8b32071f473c779a482277816867a
parenta01e836087881dd9d824417190994c9b2b0f1dbb
Merge branch 'fixes' of git://git./linux/kernel/git/ieee1394/linux1394-2.6

* 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6:
  firewire: ohci: fix DMA unmapping in an error path
  firewire: cdev: fix 32 bit userland on 64 bit kernel compat corner cases
drivers/firewire/ohci.c