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)
* '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

1  2 
drivers/firewire/ohci.c

Simple merge