Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394...
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 6 Aug 2008 19:03:43 +0000 (12:03 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 6 Aug 2008 19:03:43 +0000 (12:03 -0700)
commita14ad05f47b55ea84136eb4da43ea96fa469326a
tree1197659a31b5c0b1a9c3db4d90a083eaca7fad4d
parent0016fe9d8a1ca99a4642735f41a7753d7c1f7e2b
parent8401d92ba46a1e859464cbd9c9ee304f6e361da3
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: Preserve response data alignment bug when it is harmless