Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
John W. Linville [Wed, 6 Feb 2013 18:55:44 +0000 (13:55 -0500)]
1  2 
drivers/bcma/bcma_private.h
drivers/bcma/main.c
drivers/ssb/main.c

Simple merge
Simple merge
Simple merge