tree 596b2e9ceb312903d7437825dc45c9aa838ff71f
parent d5dc0ae4df9db00b8122378d56a071039b17a1eb
parent b6855772f4a22c4fbdd4fcaceff5c8a527035123
author David S. Miller <davem@davemloft.net> 1277229252 -0700
committer David S. Miller <davem@davemloft.net> 1277229252 -0700

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