tree 27abaa49de7ff666dbf6bbcb0d7bae2b9f029a2d
parent 0a0e9ae1bd788bc19adc4d4ae08c98b233697402
parent 85a7045a90052749885e166f40af5e9140032287
author David S. Miller <davem@davemloft.net> 1299271705 -0800
committer David S. Miller <davem@davemloft.net> 1299271705 -0800

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