aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-03-26 15:07:46 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2010-03-26 15:07:46 -0700
commit50da56706b989b99edb20f9c03172df193240c78 (patch)
tree79c89c416bc2d5369a49320bfbc91a03f3957a44 /include
parentMerge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6 (diff)
parentfirewire: core: align driver match with modalias (diff)
downloadlinux-dev-50da56706b989b99edb20f9c03172df193240c78.tar.xz
linux-dev-50da56706b989b99edb20f9c03172df193240c78.zip
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6: firewire: core: align driver match with modalias firewire: core: fix Model_ID in modalias firewire: ohci: add cycle timer quirk for the TI TSB12LV22 firewire: core: fw_iso_resource_manage: fix error handling
Diffstat (limited to 'include')
0 files changed, 0 insertions, 0 deletions