]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
projects / karo-tx-linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 22c8c93 f70490e)
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)
commit36099365c7cc64e5184b66b6eb094950a13f540c
treec91b9f3719f94864a62f2d15a71aaecd54c56711tree | snapshot
parent22c8c9343258feda9ea9ebb9e5f8cbb727b69454commit | diff
parentf70490e6078abe1182437e629f67a7f0b6f08cd4commit | 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 for KaRo TX COM modules