diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-08-25 11:24:53 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-08-25 11:24:53 -0700 |
| commit | f2154eef2a926435cdf79156cd361092d6cba91e (patch) | |
| tree | bc92864fd906158d65f8792af2e166dd68fa4a50 /net | |
| parent | 6ae26fa468533c86aaa6936fd366142fcf01386f (diff) | |
| parent | e57d2011a6276d55a87f26653a0395f302ce0d51 (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:
firewire: Add ref-counting for sbp2 orbs (fix command abortion)
firewire: fix unloading of fw-ohci while devices are attached
ieee1394: sbp2: fix sbp2_remove_device for error cases
Diffstat (limited to 'net')
0 files changed, 0 insertions, 0 deletions