tree 27d477910d630a027c0b447a58ae61b1c57dbca5
parent dcfcb256cc23c4436691b0fe677275306699d6a1
parent 45ba564d765d6165330e9bb14a197bdd348c114d
author David S. Miller <davem@davemloft.net> 1259013707 -0800
committer David S. Miller <davem@davemloft.net> 1259013707 -0800

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