tree 2b42a642fe80dc3a16d6cfb430d83af324b8d186
parent 4f262acfde22b63498b5e4f165e53d3bb4e96400
parent 7f466cff75f16ac545f34c7876e6f80225a36a6d
author David S. Miller <davem@davemloft.net> 1331152482 -0500
committer David S. Miller <davem@davemloft.net> 1331152482 -0500

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