tree 4a16115dda5a615883954f1f0695a29af7b09715
parent 85ef3e5cad3dfc6bf84bf2487e9f26a01983c196
parent 67a4cce4a89718d252b61aaf58882c69c0e2f6e3
author David S. Miller <davem@sunset.davemloft.net> 1192769847 -0700
committer David S. Miller <davem@sunset.davemloft.net> 1192769847 -0700

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