diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-10 08:14:02 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-10 08:14:02 -0800 |
| commit | 78c92a9fd4b6abbbc1fe1ec335c697cb4e63f252 (patch) | |
| tree | a04527a9a6ecb532439b84b6a6b143fac75ce594 /drivers/net/hamachi.c | |
| parent | b65f0d673a0280a49b80f44c9a62e5dfc1ec203f (diff) | |
| parent | 410cf2bd3dc6ec1ed9e1b36b25b9d7aa927ed14e (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: use split transaction timeout only for split transactions
firewire: ohci: consolidate context status flags
firewire: ohci: cache the context run bit
firewire: ohci: flush AT contexts after bus reset - addendum
firewire: ohci: flush AT contexts after bus reset for OHCI 1.2
firewire: net: set carrier state at ifup
firewire: net: add carrier detection
firewire: net: ratelimit error messages
firewire: ohci: restart iso DMA contexts on resume from low power mode
firewire: ohci: restore GUID on resume.
firewire: ohci: use common buffer for self IDs and AR descriptors
firewire: ohci: optimize iso context checks in the interrupt handler
firewire: make PHY packet header format consistent
firewire: ohci: properly clear posted write errors
firewire: ohci: flush MMIO writes in the interrupt handler
firewire: ohci: fix AT context initialization error handling
firewire: ohci: Asynchronous Reception rewrite
firewire: core: Update WARN uses
firewire: nosy: char device is not seekable
Diffstat (limited to 'drivers/net/hamachi.c')
0 files changed, 0 insertions, 0 deletions