Merge tag 'bcm2835-defconfig-next-2016-04-20' into defconfig/next

This pull request brings in changes for bcm2835_defconfig and
multi_v7_defconfig in 4.7.

Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>