]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 2e32435 3fcb771)
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)
commitf5283dbec4ec705481a0c3de7c8f1ed5b0c3e5af
tree78aa3bdef892dbd1afc8969fc528e529cfc266f7tree | snapshot
parent2e324358b135408a24cbd002c89eea66d43aaa1acommit | diff
parent3fcb7718fc6ee48e860286acae75eae6800b655bcommit | 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.