tree 8186830c461b7933c26cdd00b69e4c737c5c88e7
parent af01d537463714e36e2c96d2da35902b76cd6827
parent 18c8adeb0244f823ba78a51e23f813fe68bc3c54
author David S. Miller <davem@davemloft.net> 1220043733 -0700
committer David S. Miller <davem@davemloft.net> 1220043733 -0700

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