projects / platform / kernel / linux-amlogic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3f1e6d3 78feb35)
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
authorJohn W. Linville <linville@tuxdriver.com>
Thu, 15 Dec 2011 18:47:58 +0000 (13:47 -0500)
committerJohn W. Linville <linville@tuxdriver.com>
Thu, 15 Dec 2011 18:47:58 +0000 (13:47 -0500)
1  2 
drivers/net/wireless/ath/ath9k/rc.c patch | diff1 | diff2 | blob | history
net/nfc/nci/core.c patch | diff1 | diff2 | blob | history

diff --cc drivers/net/wireless/ath/ath9k/rc.c
Simple merge
diff --cc net/nfc/nci/core.c
Simple merge
Domain: System / Kernel;