]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 2f85bf4 d1c2491)
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
authorJohn W. Linville <linville@tuxdriver.com>
Fri, 24 Jun 2011 19:25:51 +0000 (15:25 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Fri, 24 Jun 2011 19:25:51 +0000 (15:25 -0400)
commite015bf472c18ad1905af491af2c6b6617205f3cd
treec91b9f3719f94864a62f2d15a71aaecd54c56711tree | snapshot
parent2f85bf463f80701b16f5d8dce2b4d9a0a900b439commit | diff
parentd1c2491758ebf90c20d18e87d2a5f33e1c925c6ecommit | diff
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem

Conflicts:
drivers/net/wireless/rtlwifi/pci.c
include/linux/netlink.h
14 files changed:
drivers/bcma/host_pci.c diff1 | diff2 | blob | history
drivers/net/b44.c diff1 | diff2 | blob | history
drivers/net/wireless/ath/ath5k/base.c diff1 | diff2 | blob | history
drivers/net/wireless/ath/ath9k/ath9k.h diff1 | diff2 | blob | history
drivers/net/wireless/ath/ath9k/init.c diff1 | diff2 | blob | history
drivers/net/wireless/ath/ath9k/recv.c diff1 | diff2 | blob | history
drivers/net/wireless/b43/main.c diff1 | diff2 | blob | history
drivers/net/wireless/iwlegacy/iwl-dev.h diff1 | diff2 | blob | history
drivers/net/wireless/iwlwifi/iwl-dev.h diff1 | diff2 | blob | history
drivers/net/wireless/libertas/if_spi.c diff1 | diff2 | blob | history
include/linux/netlink.h diff1 | diff2 | blob | history
include/net/bluetooth/hci_core.h diff1 | diff2 | blob | history
net/bluetooth/hci_core.c diff1 | diff2 | blob | history
net/netlink/af_netlink.c diff1 | diff2 | blob | history
Linux Kernel Source Tree.