From: Piotr Haber <phaber@broadcom.com>
Date: Thu, 25 Apr 2013 10:27:09 +0000 (+0200)
Subject: brcmsmac: Fix merge issue
X-Git-Tag: omap-for-v3.10/dt-fixes-for-merge-window~77^2~18^2^2~2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d1497f21056ca1d8ad11f1cd9734bbe9e67c5b95;p=pandora-kernel.git

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>
---

Reading git-diff-tree failed