git » linux-kernel » commit 29e5536

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

author Linus Torvalds
2009-12-01 00:47:16 UTC
committer Linus Torvalds
2009-12-01 00:47:16 UTC
parent 827d42c9ac91ddd728e4f4a31fefb906ef2ceff7
parent ed9fd93e9a0c327e5d02313ba6e233c8e76da118
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