From: David S. Miller Date: Fri, 27 Jul 2012 21:25:40 +0000 (-0700) Subject: Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville... X-Git-Tag: v5.15~21942^2 X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=7b9b04fb728ec0b94464ed902f3395aa592c5bcf;p=mirror_ubuntu-kernels.git Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless John W. Linville says: ==================== These fixes are intended for the 3.6 stream. Hauke Mehrtens provides a pair of bcma fixes, one to fix a build regression on mips and another to correct a pair of missing iounmap calls. Thomas Huehn offers a mac80211_hwsim fix to avoid a possible use-after-free bug. ==================== Signed-off-by: David S. Miller --- 7b9b04fb728ec0b94464ed902f3395aa592c5bcf