From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 15 Aug 2011 15:40:49 +0000 (-0700)
Subject: Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1... 
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=6f02bfc404decf5b5046f1413ef941e1870912f7;p=~shefty%2Frdma-dev.git

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
---

6f02bfc404decf5b5046f1413ef941e1870912f7