projects / platform / adaptation / renesas_rcar / renesas_kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 23cb3b2 8a70e7f)
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
authorJohn W. Linville <linville@tuxdriver.com>
Tue, 17 Jul 2012 19:31:33 +0000 (15:31 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Tue, 17 Jul 2012 19:31:33 +0000 (15:31 -0400)
1  2 
drivers/net/wireless/mwifiex/cfg80211.c patch | diff1 | diff2 | blob | history
net/mac80211/tx.c patch | diff1 | diff2 | blob | history
net/nfc/hci/core.c patch | diff1 | diff2 | blob | history
net/nfc/nci/core.c patch | diff1 | diff2 | blob | history

diff --cc net/mac80211/tx.c
Simple merge
diff --cc net/nfc/hci/core.c
Simple merge
diff --cc net/nfc/nci/core.c
Simple merge
Domain: System / Uncategorized;