From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 1 Dec 2009 00:47:16 +0000 (-0800)
Subject: Merge branch 'security' of git://git.kernel.org/pub/scm/linux/kernel/git/linville... 
X-Git-Tag: v2.6.32~30
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=29e553631b2a0d4eebd23db630572e1027a9967a;p=thirdparty%2Fkernel%2Flinux.git

Merge branch 'security' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6

* 'security' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6:
  mac80211: fix spurious delBA handling
  mac80211: fix two remote exploits
---

29e553631b2a0d4eebd23db630572e1027a9967a