tree 4e76cabe691946dbc01bbc72c67a5ac0eac52038
parent 8d86dc6a5bcd0f1d5b9364d43843f1bb4b15f57a
parent 10389536742cefbedecb67a5b2906f155cf3a1c3
author Linus Torvalds <torvalds@linux-foundation.org> 1276055539 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1276055539 -0700

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