tree 6c2f0158504f3463fcca1359de90b699cb636e97
parent b3b0b681b12478a7afa7d1f3d58be96830e16c7d
parent 63fc33ceb0ccc08b3f62d7bfe56a33eb33ca9427
author David S. Miller <davem@sunset.davemloft.net> 1184464729 -0700
committer David S. Miller <davem@sunset.davemloft.net> 1184464729 -0700

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