]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 876d532 aa7b199)
Merge branch 'master' of git://git.infradead.org/users/linville/wireless-next into...
authorJohn W. Linville <linville@tuxdriver.com>
Fri, 30 Sep 2011 18:52:16 +0000 (14:52 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Fri, 30 Sep 2011 18:52:29 +0000 (14:52 -0400)
commita7c284e016a387cca4c15f626fbd5029f3d6851d
tree78aa3bdef892dbd1afc8969fc528e529cfc266f7tree | snapshot
parent876d53289773c58162384061a2f9cc069f6fad3acommit | diff
parentaa7b1993b65dbb957a8bf84a036ddacf4b7c0689commit | diff
Merge branch 'master' of git://git.infradead.org/users/linville/wireless-next into for-davem

Conflicts:
drivers/net/wireless/iwlwifi/iwl-pci.c
drivers/net/wireless/wl12xx/main.c
MAINTAINERS diff1 | diff2 | blob | history
net/mac80211/cfg.c diff1 | diff2 | blob | history
net/mac80211/ibss.c diff1 | diff2 | blob | history
net/mac80211/iface.c diff1 | diff2 | blob | history
Linux Kernel Source Tree.