tree 890e07acf8c18ddc2994ebc0a0bdcdda38b0dcc6
parent b3b3f04fb587ecb61b5baa6c1c5f0e666fd12d73
parent 42c4568a4ace0adc27a9d6f02936e2047ba6fc7e
author David S. Miller <davem@davemloft.net> 1266198359 -0800
committer David S. Miller <davem@davemloft.net> 1266198359 -0800

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