Merge tag 'mac80211-for-john-2014-11-10' of git://git.kernel.org/pub/scm/linux/kernel...
authorJohn W. Linville <linville@tuxdriver.com>
Mon, 10 Nov 2014 18:08:45 +0000 (13:08 -0500)
committerJohn W. Linville <linville@tuxdriver.com>
Mon, 10 Nov 2014 18:08:45 +0000 (13:08 -0500)
Johannes Berg <johannes@sipsolutions.net> says:

"This has just one fix, for an issue with the CCMP decryption
that can cause a kernel crash. I'm not sure it's remotely
exploitable, but it's an important fix nonetheless."

Signed-off-by: John W. Linville <linville@tuxdriver.com>

Trivial merge