Merge commit '371a00448f95adaa612cf1a0b31a11e7093bc706' of 'git://git.kernel.org...
authorDavid Woodhouse <David.Woodhouse@intel.com>
Sat, 29 Sep 2012 14:37:03 +0000 (15:37 +0100)
committerDavid Woodhouse <David.Woodhouse@intel.com>
Sat, 29 Sep 2012 14:37:49 +0000 (15:37 +0100)
commit6997af7cee305bb9fc77260e84de94bfd486f7af
tree4b5969a3e02b1682828912e4666c29be571da878
parent1749c00ffc909db4ebf1b2f17fd52cdb6e7b149c
parent371a00448f95adaa612cf1a0b31a11e7093bc706
Merge commit '371a00448f95adaa612cf1a0b31a11e7093bc706' of 'git://git./linux/kernel/git/davem/net-next.git'

We need the following 2 patches from the 'net-next' tree for the BCMA flash
driver:

371a004 bcma: detect and register NAND flash device
d57ef3a bcma: detect and register serial flash device

and this is why we are merging the net-next tree (presumably persistent)
up to commit '371a004'.

Signed-off-by: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
drivers/bcma/host_pci.c
drivers/net/wireless/b43/main.c
drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c
include/linux/bcma/bcma_driver_chipcommon.h
include/net/cfg80211.h
net/mac80211/mesh.c
net/mac80211/mlme.c
net/mac80211/scan.c
net/wireless/core.c
net/wireless/util.c