summaryrefslogtreecommitdiffstats
path: root/init
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-08-15 17:40:49 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2011-08-15 17:40:49 +0200
commit6f02bfc404decf5b5046f1413ef941e1870912f7 (patch)
tree8d3ef4ebba507a3d3f2e491d25dcd51c7241a401 /init
parentMerge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sha... (diff)
parentfirewire: ohci: fix DMA unmapping in an error path (diff)
downloadlinux-6f02bfc404decf5b5046f1413ef941e1870912f7.tar.xz
linux-6f02bfc404decf5b5046f1413ef941e1870912f7.zip
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
Diffstat (limited to 'init')
0 files changed, 0 insertions, 0 deletions