From: Linus Torvalds Date: Fri, 25 Apr 2008 19:24:06 +0000 (-0700) Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394... X-Git-Tag: v2.6.26-rc1~1071 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=5f3b28781cbc030351e2fa0712602afbea592aae;p=linux-2.6-omap-h63xx.git 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 --- 5f3b28781cbc030351e2fa0712602afbea592aae