Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
authorJohn W. Linville <linville@tuxdriver.com>
Wed, 6 Feb 2013 18:55:44 +0000 (13:55 -0500)
committerJohn W. Linville <linville@tuxdriver.com>
Wed, 6 Feb 2013 18:55:44 +0000 (13:55 -0500)
commitb3b66ae4c8aff0636521034d824b8953dc617335
tree0a4c792efd730a59adc79d0d2476e0a4b3aa2f2e
parentbf414b369f158bb527f9f29174ada815f961b44c
parent7b2385b95363c9ff49801c19cba2489a05bd6672
Merge branch 'master' of git://git./linux/kernel/git/linville/wireless into for-davem
drivers/bcma/bcma_private.h
drivers/bcma/main.c
drivers/ssb/main.c