Merge branch 'for-linville' of git://git.kernel.org/pub/scm/linux/kernel/git/luca...
authorJohn W. Linville <linville@tuxdriver.com>
Mon, 25 Mar 2013 20:40:52 +0000 (16:40 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Mon, 25 Mar 2013 20:40:52 +0000 (16:40 -0400)
commit2ed79f38c4a2d63f8665b3e0d920d09ab5fa880b
tree80e311a5462be3fe33e45e4626aa46c0c4df4b16
parent48b81cc1d9fa469a50fd3b7c95ae38e748920ec1
parenta373c3cec0394756f130183551214a4bd38b4103
Merge branch 'for-linville' of git://git./linux/kernel/git/luca/wl12xx
drivers/net/wireless/ti/wlcore/main.c