Merge branch 'for-linville' of git://git.kernel.org/pub/scm/linux/kernel/git/luca...
authorJohn W. Linville <linville@tuxdriver.com>
Fri, 8 Feb 2013 19:41:45 +0000 (14:41 -0500)
committerJohn W. Linville <linville@tuxdriver.com>
Fri, 8 Feb 2013 19:41:45 +0000 (14:41 -0500)
commit4d25a75bc6c3f71d8cd736cb5d9bb2ad4ba80792
tree12307df2501537577dfe12b5966c47a58166aef3
parent3549c6b1953c3e951e71fbec94f9ed203c4754e7
parent9c3a8d99346040010a82ae8088b055f85cf8a2e9
Merge branch 'for-linville' of git://git./linux/kernel/git/luca/wl12xx