tree ce05e39a01ffce847f6f7f65f19b1e8e20dbf0c2
parent fe2a70eefa18a3e419dd9a23e16af14258b7cc20
parent cfef6047c4027a8448ec8dafeaf2bb362cc882e4
author David S. Miller <davem@davemloft.net> 1303760797 -0700
committer David S. Miller <davem@davemloft.net> 1303760797 -0700

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