tree 969d1ccf3cc47e8fe1c2154f75502cf9b67e9402
parent 99fee6d7e5748d96884667a4628118f7fc130ea0
parent 66fbb541a5d2d58fdae21c1e7b558a75bfbd483f
author David S. Miller <davem@sunset.davemloft.net> 1195098242 -0800
committer David S. Miller <davem@sunset.davemloft.net> 1195098242 -0800

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