projects / GitHub / exynos8895 / android_kernel_samsung_universal8895.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 99fee6d 66fbb54)
Merge branch 'fixes-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville...
authorDavid S. Miller <davem@sunset.davemloft.net>
Thu, 15 Nov 2007 03:44:02 +0000 (19:44 -0800)
committerDavid S. Miller <davem@sunset.davemloft.net>
Thu, 15 Nov 2007 03:44:02 +0000 (19:44 -0800)
1  2 
drivers/net/wireless/iwlwifi/iwl3945-base.c patch | diff1 | diff2 | blob | history
drivers/net/wireless/iwlwifi/iwl4965-base.c patch | diff1 | diff2 | blob | history
net/mac80211/ieee80211_i.h patch | diff1 | diff2 | blob | history
net/mac80211/ieee80211_sta.c patch | diff1 | diff2 | blob | history

diff --cc net/mac80211/ieee80211_i.h
Simple merge
diff --cc net/mac80211/ieee80211_sta.c
Simple merge