tree c7b805f441b1d8cb2e86b8411cf2302ff46186b4
parent 51611a120e8120290152edd7d0020d22a7f4b4a3
parent 2f0accc13520b2644b85f80aedce10d10d88b0ca
author David S. Miller <davem@davemloft.net> 1244702503 -0700
committer David S. Miller <davem@davemloft.net> 1244702503 -0700

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