David S. Miller <davem@davemloft.net> 1240266826 -0700

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
��px�)x���Oo�0