diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-02-06 08:48:16 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-02-06 08:48:16 -0800 |
commit | 5e3bd4e4b1082e406351083784e3de4cdaa50d7a (patch) | |
tree | 9fdc50af3999e9e978f7df05088a0b8bc8421706 /net/irda/af_irda.c | |
parent | bcee402e764ccbdb507fe56936230af7cb57c813 (diff) | |
parent | 86431532ec4311dccd0d7513cebae6ffc762756b (diff) |
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
Diffstat (limited to 'net/irda/af_irda.c')
0 files changed, 0 insertions, 0 deletions