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)
commit5da0c7aad6271dd29526e3b49cbeb3bab9e8e491
treeae8e3d33eb5e71a83a9420b45eca9d7499b5a97f
parent615bb29ccbe9fa06d9f33b29d9c3f51340726656
parent9e66269d40229cd9823024120910a43af57a9d72
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:
  ieee1394: iso and async streams: s/g list fix