Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
authorJohn W. Linville <linville@tuxdriver.com>
Thu, 17 Nov 2011 19:15:47 +0000 (14:15 -0500)
committerJohn W. Linville <linville@tuxdriver.com>
Thu, 17 Nov 2011 19:15:47 +0000 (14:15 -0500)
commitc4be3c2da1ab4344d3d5f63d6ec1952a3c6e635c
tree8235782fe36c446cd1a84477404c82e56c8d4407
parent102463b18d922dd55c29fbfa222e0355ecf3e42f
parentfe09b32a4361bea44169b2063e8c867cabb6a8ba
Merge branch 'master' of git://git./linux/kernel/git/linville/wireless into for-davem
drivers/net/wireless/libertas/if_spi.c