tree 2a112e848cc227e722f7650fff4ca5c610acacae
parent 85fadea9ce4b278b959886748b2798a383667c10
parent c11114717a66455de9fbc3ea69ae00d1aace3c14
author David S. Miller <davem@davemloft.net> 1307391936 -0700
committer David S. Miller <davem@davemloft.net> 1307391936 -0700

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