Merge commit '371a0044' of...

Merge commit '371a0044' of 'git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next.git

'

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

371a0044 bcma: detect and register NAND flash device
d57ef3a6 bcma: detect and register serial flash device

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

Signed-off-by: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>