]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
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)
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6:
  ieee1394: change deprecation status of dv1394


Trivial merge