]> 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, 30 Jun 2011 15:26:04 +0000 (11:26 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Thu, 30 Jun 2011 15:26:04 +0000 (11:26 -0400)
commit690b0cacb6dbbbcb06b76139ab65e1bf3f63e7f1
tree9199b20addcd9167a210957ac477a284c6f9a73d
parent16adf5d07987d93675945f3cecf0e33706566005
parenta0b8de350be458b33248e48b2174d9af8a4c4798
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 into for-davem