Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394...
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Sun, 4 Nov 2007 21:14:15 +0000 (13:14 -0800)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Sun, 4 Nov 2007 21:14:15 +0000 (13:14 -0800)
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6:
  ieee1394: iso and async streams: s/g list fix


Trivial merge