Merge remote-tracking branch 'cm/cm-11.0'

Signed-off-by: Chet Kener <Cl3Kener@gmail.com>

Conflicts:
	drivers/net/wireless/bcmdhd/Makefile