Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...

diff --cc drivers/bcma/bcma_private.h
Simple merge

diff --cc drivers/bcma/main.c
Simple merge

diff --cc drivers/ssb/main.c
Simple merge