Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
authorDavid S. Miller <davem@davemloft.net>
Wed, 15 Dec 2010 17:43:13 +0000 (09:43 -0800)
committerDavid S. Miller <davem@davemloft.net>
Wed, 15 Dec 2010 17:43:13 +0000 (09:43 -0800)
commit82cc4f5cb8be6dede34c32a814ab1470409e1840
tree1ab46942502a2841479c8a614d5bca8a7901227a
parent2a27a03d3a891e87ca33d27a858b4db734a4cbab
parent56e6417b49132d4f56e9f2241d31942b90b46315
Merge branch 'master' of git://git./linux/kernel/git/linville/wireless-2.6