Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
commitc65570503716015110350ba1c52a04156df3a455
authorDavid S. Miller <davem@davemloft.net>
Thu, 11 Sep 2008 22:46:02 +0000 (11 15:46 -0700)
committerDavid S. Miller <davem@davemloft.net>
Thu, 11 Sep 2008 22:46:02 +0000 (11 15:46 -0700)
treeeda3dbe423a85a6bd07aba954f52d2fc6fa4336d
parent638266f7e879e34de4a4635049c15f5a58505e75
parent0112c9e9e8d47f1d1e6ce1323675cb43ca6aae86
Merge branch 'master' of git://git./linux/kernel/git/linville/wireless-next-2.6