Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
authorDavid S. Miller <davem@davemloft.net>
Mon, 16 Aug 2010 20:56:01 +0000 (13:56 -0700)
committerDavid S. Miller <davem@davemloft.net>
Mon, 16 Aug 2010 20:56:01 +0000 (13:56 -0700)
commit5ca6f7c85159a5ca7e637b1d9f79f0d9bc56e5dc
treeed4f35d48b2859d7ced04c9f8e0f4f6b3ac0f603
parentdaa3766e705c2605bd7f63b80c7742014ef9e04e
parent6ccf15a1a76d2ff915cdef6ae4d12d0170087118
Merge branch 'master' of git://git./linux/kernel/git/linville/wireless-2.6