| commit | 29e553631b2a0d4eebd23db630572e1027a9967a | |
| author | Linus Torvalds <torvalds@linux-foundation.org> | |
| Tue, 1 Dec 2009 00:47:16 +0000 (30 16:47 -0800) | ||
| committer | Linus Torvalds <torvalds@linux-foundation.org> | |
| Tue, 1 Dec 2009 00:47:16 +0000 (30 16:47 -0800) | ||
| tree | a891e02cc245ac9c14dc47528120e262d0298698 | treesnapshot (tar.gz zip) |
| parent | ed9fd93e9a0c327e5d02313ba6e233c8e76da118 | commitdiff |
| parent | 827d42c9ac91ddd728e4f4a31fefb906ef2ceff7 | commitdiff |
Merge branch 'security' of git://git./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
* '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