diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-05-15 12:01:59 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-05-15 12:02:06 -0700 |
| commit | 3346857f6fab1d6d1237a3ec7cfa159ec9b52db5 (patch) | |
| tree | 9468318835176cdb6e51a8ec4c8c87340c080611 /net/netrom | |
| parent | 5d41343ac88eeddd25dc4ffb7050c9095c41a70d (diff) | |
| parent | 542cc7937e6af73cb2edc455a0e456d22e254abb (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6:
iwlwifi: fix device id registration for 6000 series 2x2 devices
ath5k: update channel in sw state after stopping RX and TX
rtl8187: use DMA-aware buffers with usb_control_msg
mac80211: avoid NULL ptr deref when finding max_rates in PID and minstrel
airo: airo_get_encode{,ext} potential buffer overflow
Pulled directly by Linus because Davem is off playing shuffle-board at
some Alaskan cruise, and the NULL ptr deref issue hits people and should
get merged sooner rather than later.
David - make us proud on the shuffle-board tournament!
Diffstat (limited to 'net/netrom')
0 files changed, 0 insertions, 0 deletions