projects / openwrt / staging / blogic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ed9fd93 827d42c)
Merge branch 'security' of git://git.kernel.org/pub/scm/linux/kernel/git/linville...
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 1 Dec 2009 00:47:16 +0000 (16:47 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 1 Dec 2009 00:47:16 +0000 (16:47 -0800)
* '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


Trivial merge
John Crispins staging tree