projects / GitHub / LineageOS / android_kernel_samsung_universal7580.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: db98a6c d2460f4)
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
authorJohn W. Linville <linville@tuxdriver.com>
Wed, 5 Jan 2011 19:35:41 +0000 (14:35 -0500)
committerJohn W. Linville <linville@tuxdriver.com>
Wed, 5 Jan 2011 19:35:41 +0000 (14:35 -0500)
1  2 
drivers/net/wireless/iwlwifi/iwl-agn.c patch | diff1 | diff2 | blob | history
drivers/net/wireless/iwlwifi/iwl-helpers.h patch | diff1 | diff2 | blob | history
net/mac80211/key.c patch | diff1 | diff2 | blob | history
net/mac80211/rx.c patch | diff1 | diff2 | blob | history

diff --cc net/mac80211/key.c
Simple merge
diff --cc net/mac80211/rx.c
Simple merge