tree 5039770cf62f69317c974775190cc4f5919f8398
parent 7e96fbf2320782fb8f0970928026105cd34b41bd
parent 38d59392b29437af3a702209b6a5196ef01f79a8
author David S. Miller <davem@davemloft.net> 1295383819 -0800
committer David S. Miller <davem@davemloft.net> 1295383819 -0800

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