]> 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>
Tue, 22 Mar 2011 21:36:18 +0000 (14:36 -0700)
committerDavid S. Miller <davem@davemloft.net>
Tue, 22 Mar 2011 21:36:18 +0000 (14:36 -0700)
commitdb138908ccff404b9920f18f6244f4bff2368c04
tree18734f9b833a5f1134fc138a00d9223fc2afa028
parent04024b937a6e9b7d4320b5853557cea3930d528c
parent8bc8aecdc5e26cfda12dbd6867af4aa67836da6a
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6