]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commit
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
authorDavid S. Miller <davem@davemloft.net>
Thu, 24 Mar 2011 18:43:09 +0000 (11:43 -0700)
committerDavid S. Miller <davem@davemloft.net>
Thu, 24 Mar 2011 18:43:09 +0000 (11:43 -0700)
commit54a4fe5499542f083ff282048c6a5afb8d4aca16
tree685833fe9dec1cf86d1338297d6ed94a27e3f298
parentef352e7cdf714596f51ad18809404edeaa50e8fd
parentd78f4b3e2c4dfb9487624f7157af04ab4260e189
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6