review.tizen.org Git - profile/ivi/kernel-adaptation-intel-automotive.git/commit

projects / profile / ivi / kernel-adaptation-intel-automotive.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 90c3033 5ffaf8a)

author	David S. Miller <davem@davemloft.net>
	Thu, 4 Feb 2010 16:58:14 +0000 (08:58 -0800)
committer	David S. Miller <davem@davemloft.net>
	Thu, 4 Feb 2010 16:58:14 +0000 (08:58 -0800)
commit	10be7eb36b93364b98688831ee7d26f58402bb96
tree	eb13ae80fcaa8baacd804a721c5a4962a501a2a4	tree \| snapshot
parent	90c30335a70e96b8b8493b7deb15e6b30e6d9fce	commit \| diff
parent	5ffaf8a361b4c9025963959a744f21d8173c7669	commit \| diff

Merge branch 'master' of git://git./linux/kernel/git/linville/wireless-next-2.6

16 files changed:

arch/powerpc/configs/ppc64_defconfig	diff1 \|	diff2 \|	blob \| history
drivers/net/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/airo.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/ath5k/base.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/ath9k/hw.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/ath9k/main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/ath9k/pci.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/ath9k/rc.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/b43/main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/iwl-3945.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/iwl-3945.h	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/iwl-agn.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/iwl-sta.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/p54/p54pci.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/rtl818x/rtl8180_dev.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/driver-trace.h	diff1 \|	diff2 \|	blob \| history

Domain: System / Uncategorized;