tree 1387cb2fcea6d4119cd7ad13c76e79c41d5ff4ac
parent f7ce1f5e083fc099346019fb1f8d56a5452703ed
parent e38649702ea64fdbbab3dd459bf8558142dd3bc4
author Linus Torvalds <torvalds@linux-foundation.org> 1209151446 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1209151446 -0700

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