tree 8d3ef4ebba507a3d3f2e491d25dcd51c7241a401
parent a0b3447fb1d8b32071f473c779a482277816867a
parent a01e836087881dd9d824417190994c9b2b0f1dbb
author Linus Torvalds <torvalds@linux-foundation.org> 1313422849 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1313422849 -0700

Merge branch 'fixes' of git://git.kernel.org/pub/scm/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