Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394...
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 11 Dec 2009 23:22:27 +0000 (15:22 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 11 Dec 2009 23:22:27 +0000 (15:22 -0800)
commit5f1141eb352ea79d849920039503e40dd623fffa
tree1378b88a847c483933334d5c3695138bfa6c5a4d
parent880188b2433c3af51fa006207d9b13c70d2e5938
parent8c0c0cc2d9f4c523fde04bdfe41e4380dec8ee54
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: ohci: handle receive packets with a data length of zero
drivers/firewire/ohci.c