]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commit
projects / mirror_ubuntu-disco-kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: c88d0dc 36eed56)
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi...
authorJohn W. Linville <linville@tuxdriver.com>
Tue, 12 Feb 2013 17:51:08 +0000 (12:51 -0500)
committerJohn W. Linville <linville@tuxdriver.com>
Tue, 12 Feb 2013 17:51:08 +0000 (12:51 -0500)
commit5171f7a0b79dfbc61a6e12f20f6eef6d7dd5b2a8
tree50e48f8b65bc10fd7b8959735cb599884a161d1btree
parentc88d0dc1cc0182358ce1ae6f457dace34539eb12commit | diff
parent36eed56a8f7e1bd7fb5014ea0e702708e1702f30commit | diff
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next

Conflicts:
drivers/net/wireless/iwlwifi/mvm/mac80211.c
drivers/net/wireless/iwlwifi/dvm/mac80211.c diff1 | diff2 | blob | history
drivers/net/wireless/iwlwifi/mvm/mac80211.c diff1 | diff2 | blob | history
Ubuntu Disco kernel mirror for Proxmox VE and PMG