summaryrefslogtreecommitdiff
path: root/kernel
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-06-08 20:52:19 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2010-06-08 20:52:19 -0700
commit84f7586edab93052bbe7eb72e1e9bce5f7b6ae45 (patch)
tree4e76cabe691946dbc01bbc72c67a5ac0eac52038 /kernel
parent8d86dc6a5bcd0f1d5b9364d43843f1bb4b15f57a (diff)
parent10389536742cefbedecb67a5b2906f155cf3a1c3 (diff)
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: check for 1394a compliant IRM, fix inaccessibility of Sony camcorder
Diffstat (limited to 'kernel')
0 files changed, 0 insertions, 0 deletions