Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394...
commit5e3bd4e4b1082e406351083784e3de4cdaa50d7a
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 6 Feb 2009 16:48:16 +0000 (6 08:48 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 6 Feb 2009 16:48:16 +0000 (6 08:48 -0800)
tree9fdc50af3999e9e978f7df05088a0b8bc8421706
parentbcee402e764ccbdb507fe56936230af7cb57c813
parent86431532ec4311dccd0d7513cebae6ffc762756b
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: dv1394: move deprecation message from module init to file open
  firewire: core: Remove card from list of cards when enable fails