Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394...
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 9 Jun 2010 03:52:19 +0000 (20:52 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 9 Jun 2010 03:52:19 +0000 (20:52 -0700)
commit84f7586edab93052bbe7eb72e1e9bce5f7b6ae45
tree4e76cabe691946dbc01bbc72c67a5ac0eac52038
parent8d86dc6a5bcd0f1d5b9364d43843f1bb4b15f57a
parent10389536742cefbedecb67a5b2906f155cf3a1c3
Merge branch 'for-linus' of git://git./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