]> 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>
Mon, 9 Jul 2012 19:09:08 +0000 (15:09 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Mon, 9 Jul 2012 19:09:08 +0000 (15:09 -0400)
commitc1109736bcdd14b590392e9a96d66e7e823f9e67
tree4117e9ef3e834aa611ab00839df0ed2b07cf5b50
parentbb3bb3a5b839fa5c0a2c386640e865320a1fb64c
parentb48d96652626b315229b1b82c6270eead6a77a6d
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem