tree c2ce874f2ab7f107dddf7b854772e0f3b64d35a1
parent 70c03b49b80ba3634958acc31853771019c0ebd3
parent 18d7260527ce7c0d0a177afdf92d8f868f50b067
author David S. Miller <davem@davemloft.net> 1215319313 -0700
committer David S. Miller <davem@davemloft.net> 1215319313 -0700

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