tree 688fe26dd4ceda5364692f0ce307aadb6f04f331
parent b3ff29d2ccfe3af065a9b393699a8fbf2abd1b15
parent b8abde45d7d6ab9e8ceced9b5990eeb1149d0b97
author David S. Miller <davem@davemloft.net> 1233693718 -0800
committer David S. Miller <davem@davemloft.net> 1233693718 -0800

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