tree fbf291540b824183e0d9292906e9570fd344ebaa
parent fa1a9c681377c57e233038e50479e7d7a5cc3108
parent b2e3abdc708f8c0eff194af25362fdb239abe241
author David S. Miller <davem@davemloft.net> 1252542825 -0700
committer David S. Miller <davem@davemloft.net> 1252542825 -0700

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