Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
authorDavid S. Miller <davem@davemloft.net>
Thu, 20 Nov 2008 12:01:29 +0000 (04:01 -0800)
committerDavid S. Miller <davem@davemloft.net>
Thu, 20 Nov 2008 12:01:29 +0000 (04:01 -0800)
commitf7f65d1e8bfaa92c1a419c2a52faeca835659295
treeb616a113bddb2728fca89ef3062c16b220cee620
parenteafdcb433f854c8cb06747a80fa3df7c72147be6
parent4018517a1a69a85c3d61b20fa02f187b80773137
Merge branch 'master' of git://git./linux/kernel/git/linville/wireless-2.6