tree cc2629911f6b011ee2e3f4a85febbb9b6cc63604
parent 7a1abd08d52fdeddb3e9a5a33f2f15cc6a5674d2
parent 7379efeacb707f49729080791a7a562d8996aec4
author David S. Miller <davem@davemloft.net> 1289456131 -0800
committer David S. Miller <davem@davemloft.net> 1289456131 -0800

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