Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394...
commit974717012029ee36d19069c12e3c9bb13fa715a8
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Tue, 23 Oct 2007 02:14:05 +0000 (22 19:14 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Tue, 23 Oct 2007 02:14:05 +0000 (22 19:14 -0700)
tree4ca4c2b053dc99335b05121a18b7a891d90b9c32
parent69450bb5eb8e9df28281c62f98e971c9969dc4ff
parent4b6d51ec62d9c57432430528d6293605794a9f1b
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: fw-ohci: shut up a superfluous compiler warning
  firewire: fw-ohci: log a note about unsupported features