From: Roland Vossen <rvossen@broadcom.com>
Date: Mon, 8 Aug 2011 13:57:47 +0000 (+0200)
Subject: staging: brcm80211: merged bmac.c into main.c
X-Git-Tag: v3.2-rc1~169^2^2~864^2~381
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8702fee6460cac456f28117bda19559c57913671;p=pandora-kernel.git

staging: brcm80211: merged bmac.c into main.c

Future goal is to merge the bmac layer in the driver with the 'common' layer.
A step towards this goal is to have one file containing both bmac and common
code. Header files (bmac.h, main.h) were also merged.

Signed-off-by: Roland Vossen <rvossen@broadcom.com>
Reviewed-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---

Reading git-diff-tree failed