tree b2c276067819f259f86369e5341202332a8172be
parent ffcb97388b1d41b1db063eb041cb9af408662127
parent c288ec614e264b46853c65d3db9ccf91d53c9484
author John W. Linville <linville@tuxdriver.com> 1330977954 -0500
committer John W. Linville <linville@tuxdriver.com> 1330977954 -0500

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