Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
authorDavid S. Miller <davem@davemloft.net>
Tue, 26 Oct 2010 18:32:28 +0000 (11:32 -0700)
committerDavid S. Miller <davem@davemloft.net>
Tue, 26 Oct 2010 18:32:28 +0000 (11:32 -0700)
commit78fd9c4491a9c4cf8b401f1c5a516d3d28d3b42b
treeaa65a89a09cd28f7b305c4f27a47903996b5b365
parentb9958a951ed4f8adff9ce02c2b1cb4ede8e2aa0e
parent822395b591db32ad3cf8a5b57b0fe30fb8d12c37
Merge branch 'master' of git://git./linux/kernel/git/linville/wireless-2.6