projects / GitHub / MotorolaMobilityLLC / kernel-slsi.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 448f262 51e6525)
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
authorJohn W. Linville <linville@tuxdriver.com>
Fri, 10 Jun 2011 18:26:12 +0000 (14:26 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Fri, 10 Jun 2011 18:26:12 +0000 (14:26 -0400)
Conflicts:
drivers/net/wireless/iwlwifi/iwl-agn-rxon.c
drivers/net/wireless/rtlwifi/pci.c

1  2 
drivers/net/wireless/iwlegacy/iwl-4965.c patch | diff1 | diff2 | blob | history
drivers/net/wireless/rtlwifi/pci.c patch | diff1 | diff2 | blob | history
net/wireless/nl80211.c patch | diff1 | diff2 | blob | history

diff --cc drivers/net/wireless/rtlwifi/pci.c
Simple merge
diff --cc net/wireless/nl80211.c
Simple merge
Motorola kernel-slsi