tree 844ced1a54745c14ea45d33ccad4eae6e7253322
parent c3b85423072c0739d76b7c54080d3f3ccc5dad4d
parent 1ce822fa04fd6878f079461a4b8affe4bb5ec27b
author David S. Miller <davem@davemloft.net> 1247101993 -0700
committer David S. Miller <davem@davemloft.net> 1247101993 -0700

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