tree 4adda0d1a8616ce586ea26a25717477c9e18667a
parent 8aa51d64c1f526e43b1e7f89fb8b98c2fd583f4b
parent 671267bf3aac3dae0555730b07ef29c042e325b2
author John W. Linville <linville@tuxdriver.com> 1337114280 -0400
committer John W. Linville <linville@tuxdriver.com> 1337114280 -0400

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem