diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-22 21:29:52 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-22 21:29:52 -0700 |
| commit | 1053414068bad659479e6efa62a67403b8b1ec0a (patch) | |
| tree | d4096db0f3aa9ca5e6b44c85ab848b7bedbfc37a /include/linux/marker.h | |
| parent | b88f8a546f5dba213938fdfc11e66bc5c2421623 (diff) | |
| parent | 0c53decdd0a9f9c459ccabe0b5f79660bde5375b (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: new stack is no longer experimental
firewire: net: better FIFO address range check and rcodes
firewire: net: fix card driver reloading
firewire: core: fix iso context shutdown on card removal
firewire: core: fix DMA unmapping in iso buffer removal
firewire: net: adjust net_device ops
firewire: net: remove unused code
firewire: net: allow for unordered unit discovery
firewire: net: style changes
firewire: net: add Kconfig item, rename driver
firewire: add IPv4 support
Diffstat (limited to 'include/linux/marker.h')
0 files changed, 0 insertions, 0 deletions