diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-24 00:21:45 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-24 00:21:45 -0700 |
| commit | e1f1f07334e73fbe53fd8432f57846d5a1b90b5a (patch) | |
| tree | 5806700a8a9509732aa2dc752c9e93b77052aa89 /net/tipc/net.c | |
| parent | 472e449c1018a6ef81bc6e38ddfc1eaab9378ca6 (diff) | |
| parent | d49824c06778830c82906884b94d94354c3bbdc8 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6:
Staging: sep: remove driver
Staging: batman-adv: Don't write in not allocated packet_buff
Staging: batman-adv: Don't use net_dev after dev_put
Staging: batman-adv: Create batman_if only on register event
Staging: batman-adv: fix own mac address detection
Staging: batman-adv: always reply batman icmp packets with primary mac
Staging: batman-adv: fix batman icmp originating from secondary interface
Staging: batman-adv: unify orig_hash_lock spinlock handling to avoid deadlocks
Staging: batman-adv: Fix merge of linus tree
Staging: spectra: removes unused functions
Staging: spectra: initializa lblk variable
Staging: spectra: removes unused variable
Staging: spectra: remove duplicate GLOB_VERSION definition
Staging: spectra: don't use locked_ioctl, fix build
Staging: use new REQ_FLUSH flag, fix build breakage
Staging: spectra: removes q->prepare_flush_fn, fix build breakage
Diffstat (limited to 'net/tipc/net.c')
0 files changed, 0 insertions, 0 deletions