Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
commit48d3ff82698cb0094684aed70446e0a5cbb1a4d0
authorDavid S. Miller <davem@davemloft.net>
Thu, 19 Aug 2010 23:54:13 +0000 (19 16:54 -0700)
committerDavid S. Miller <davem@davemloft.net>
Thu, 19 Aug 2010 23:54:13 +0000 (19 16:54 -0700)
tree4f3554f1e82d17d60d0e1e3bf95dfea1120f0374
parent1aef70ef125165e0114a8e475636eff242a52030
parent6a017e043a8c5e4f1e7c1152bc6477da8066f5f6
Merge branch 'master' of git://git./linux/kernel/git/linville/wireless-2.6