tree 9fdc50af3999e9e978f7df05088a0b8bc8421706
parent bcee402e764ccbdb507fe56936230af7cb57c813
parent 86431532ec4311dccd0d7513cebae6ffc762756b
author Linus Torvalds <torvalds@linux-foundation.org> 1233938896 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1233938896 -0800

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: dv1394: move deprecation message from module init to file open
  firewire: core: Remove card from list of cards when enable fails