projects / platform / kernel / linux-amlogic.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 00b38ab) | patch
brcmsmac: Fix merge issue
authorPiotr Haber <phaber@broadcom.com>
Thu, 25 Apr 2013 10:27:09 +0000 (12:27 +0200)
committerJohn W. Linville <linville@tuxdriver.com>
Fri, 26 Apr 2013 12:42:22 +0000 (08:42 -0400)
commitd1497f21056ca1d8ad11f1cd9734bbe9e67c5b95
tree428b4d4140654c8982b19f7da0c5e479bf0b3662tree | snapshot
parent00b38ab35d9bd2253a4d1e659382871d2220e095commit | diff
brcmsmac: Fix merge issue

Commit 7088f4835aa353f7226e57e73fd9e6564a4dfb75
"Merge branch 'master' of
git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless"
ramoved call to brcms_led_unregister in mac80211_if.c

Reviewed-by: Hante Meuleman <meuleman@broadcom.com>
Reviewed-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: Piotr Haber <phaber@broadcom.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c diff | blob | history
Domain: System / Kernel;