Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
authorDavid S. Miller <davem@davemloft.net>
Wed, 8 Dec 2010 16:13:01 +0000 (08:13 -0800)
committerDavid S. Miller <davem@davemloft.net>
Wed, 8 Dec 2010 16:13:01 +0000 (08:13 -0800)
commit4f58605e6b7ae30a0d048af6a868582768e6754c
tree2b72e81761c7874b48825267958e58823e05b592
parentb8eb3a1046f68a5b8f284830d971c62688cd606b
parentd89197c7f34934fbb0f96d938a0d6cfe0b8bcb1c
Merge branch 'master' of git://git./linux/kernel/git/linville/wireless-2.6