tree a0261a4fae2b2e288cbc7e14a8f1acd47d4f2df4
parent 429a01a70f301baf0c8fc780f891a18c296d5e24
parent fc7c976dc7a565213393ce700d4a6105f037bf20
author David S. Miller <davem@davemloft.net> 1297195434 -0800
committer David S. Miller <davem@davemloft.net> 1297195434 -0800

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