Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394...
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Wed, 11 Apr 2007 00:24:36 +0000 (17:24 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Wed, 11 Apr 2007 00:24:36 +0000 (17:24 -0700)
commitc3474be4ddcae0256a13cbbe35d849c153c4ec4b
tree03a19c106dea8c60a26eff45444a290df330c98a
parent5a92d635bec814fb53595fc80488765bc0d4ff0e
parent199c1167f5e8123a9b0a9ab1e8b78a6aa4b2733f
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:
  ieee1394: change deprecation status of dv1394