diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-02-10 15:19:23 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-02-10 15:19:23 -0500 |
| commit | b477958314796f51c54829dbaea89b1f46dabd06 (patch) | |
| tree | f122521b0ac17e1de695a3be84da50759645da6a /drivers/net/wireless/wl12xx/spi.c | |
| parent | e128c5e26bd474a2a56b96ec7c8967aff347b763 (diff) | |
| parent | 5414e557fca545614ceedc3d3496f747457e2e3b (diff) | |
Merge branch 'staging-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6
* 'staging-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6:
staging: zram: fix data corruption issue
Staging: Comedi: Fix a few NI module dependencies
Staging: comedi: Add MODULE_LICENSE and similar to NI modules
staging: brcm80211: bugfix for softmac crash on multi cpu configurations
staging: sst: Fix for dmic capture on v2 pmic
staging: hv: Enable sending GARP packet after live migration
Diffstat (limited to 'drivers/net/wireless/wl12xx/spi.c')
0 files changed, 0 insertions, 0 deletions