From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 15 May 2009 19:01:59 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
X-Git-Tag: v2.6.30-rc6~5
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=3346857f6fab1d6d1237a3ec7cfa159ec9b52db5;p=users%2Fhch%2Fblock.git

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!
---

3346857f6fab1d6d1237a3ec7cfa159ec9b52db5