| commit | 6f02bfc404decf5b5046f1413ef941e1870912f7 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Mon Aug 15 08:40:49 2011 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Mon Aug 15 08:40:49 2011 -0700 |
| tree | 8d3ef4ebba507a3d3f2e491d25dcd51c7241a401 | |
| parent | a0b3447fb1d8b32071f473c779a482277816867a [diff] | |
| parent | a01e836087881dd9d824417190994c9b2b0f1dbb [diff] |
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