]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commit
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
authorJohn W. Linville <linville@tuxdriver.com>
Thu, 17 Jan 2013 17:07:44 +0000 (12:07 -0500)
committerJohn W. Linville <linville@tuxdriver.com>
Thu, 17 Jan 2013 17:07:44 +0000 (12:07 -0500)
commit811477de5f6d65baea69f25cb5528d428b82cc9c
treef3c4245199b08f3f5729e46ac02aa4beb92156bb
parentfa1e492aa3cbafba9f8fc6d05e5b08a3091daf4a
parent4668cce527acb3bd048c5e6c99b157a14b214671
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem