tree bff8932bb5e64c22708aad48a6edbef3a707a774
parent 5ca1b998d33c39819fca2b675d80c4469e705f2d
parent d0bec34293bb0b8dddc26d25bd46a6631d6b3ec3
author David S. Miller <davem@davemloft.net> 1251926289 -0700
committer David S. Miller <davem@davemloft.net> 1251926289 -0700

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