tree 0789ba36d96dba330416a1e6a9a68e891a78802a
parent 35700212b45ea9f98fa682cfc1bc1a67c9ccc34b
parent 18b6c9a2213d3b6e0212e8b225abf95f7564206a
author David S. Miller <davem@davemloft.net> 1259103689 -0800
committer David S. Miller <davem@davemloft.net> 1259103689 -0800

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