tree 12307df2501537577dfe12b5966c47a58166aef3
parent 3549c6b1953c3e951e71fbec94f9ed203c4754e7
parent 9c3a8d99346040010a82ae8088b055f85cf8a2e9
author John W. Linville <linville@tuxdriver.com> 1360352505 -0500
committer John W. Linville <linville@tuxdriver.com> 1360352505 -0500

Merge branch 'for-linville' of git://git.kernel.org/pub/scm/linux/kernel/git/luca/wl12xx