]> pilppa.com Git - linux-2.6-omap-h63xx.git/commit
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394...
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 25 Apr 2008 19:24:06 +0000 (12:24 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 25 Apr 2008 19:24:06 +0000 (12:24 -0700)
commit5f3b28781cbc030351e2fa0712602afbea592aae
tree1387cb2fcea6d4119cd7ad13c76e79c41d5ff4ac
parentf7ce1f5e083fc099346019fb1f8d56a5452703ed
parente38649702ea64fdbbab3dd459bf8558142dd3bc4
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6:
  ieee1394: silence defined but not used warning in non-modular builds
  ieee1394: rawiso: requeue packet for transmission after skipped cycle