diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-09-07 14:05:22 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-09-07 14:05:22 -0700 |
| commit | 96d4cbb6a91af9d43db110eec1d8c61d41eb46b4 (patch) | |
| tree | 02efd0d9a32365045e262644db81661c93531914 /drivers/net/3c59x.c | |
| parent | d3de0eb1642feda3c53fb455e7cf07b222deafb5 (diff) | |
| parent | aff3ea4e5d4b0280d1c631fcce048e7f009bc3e5 (diff) | |
| download | blackbird-op-linux-96d4cbb6a91af9d43db110eec1d8c61d41eb46b4.tar.gz blackbird-op-linux-96d4cbb6a91af9d43db110eec1d8c61d41eb46b4.zip | |
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: wlan-ng: Explicitly set some fields in cfg80211 interface
Staging: octeon: depends on NETDEVICES
Staging: spectra: depend on X86_MRST
Staging: zram: free device memory when init fails
Staging: rt2870sta: Add more device IDs from vendor drivers
staging: comedi das08_cs.c: Fix io_req_t conversion
staging: spectra needs <linux/slab.h>
staging: hv: Fixed lockup problem with bounce_buffer scatter list
staging: hv: Increased storvsc ringbuffer and max_io_requests
staging: hv: Fixed the value of the 64bit-hole inside ring buffer
staging: hv: Fixed bounce kmap problem by using correct index
staging: hv: Fix missing functions for net_device_ops
Diffstat (limited to 'drivers/net/3c59x.c')
0 files changed, 0 insertions, 0 deletions
