diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-08-10 09:00:51 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-08-10 09:00:51 -0700 |
| commit | 8ae3f1d09566038606a18576604ecc957a935c48 (patch) | |
| tree | 428a087efd8596ec38c2cf9af557eac97d887353 /drivers/net/wireless/ath/ath5k/mac80211-ops.c | |
| parent | e6e8ac441cd2c1fed16f1864b170d9d471aeb7fe (diff) | |
| parent | cefe8a32f2a5887246ed250115e34bee6ecc8d61 (diff) | |
Merge tag 'staging-3.11-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging
Pull staging driver fixes from Greg KH:
"Here are 3 small fixes for staging/IIO drivers for 3.11-rc5. Nothing
huge, two IIO driver fixes, and a zcache fix. All of these have been
in linux-next for a while"
* tag 'staging-3.11-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging:
staging: zcache: fix "zcache=" kernel parameter
iio: ti_am335x_adc: Fix wrong samples received on 1st read
iio:trigger: Fix use_count race condition
Diffstat (limited to 'drivers/net/wireless/ath/ath5k/mac80211-ops.c')
0 files changed, 0 insertions, 0 deletions