summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTobias Klauser <tklauser@distanz.ch>2018-12-02 19:13:27 +0100
committerTobias Klauser <tklauser@distanz.ch>2018-12-02 19:13:49 +0100
commitc2e7dfc43d7f1ade191f286b93d463d1f98f4d3b (patch)
treec0a39ca4071934780b39ce536daa4ac47ca0ed26
parent04b3fe157db3e3aa22caf632928d5f06aa3f88bd (diff)
AUTHORS: add Whang Choi
Add Whang Choi for PR #202 Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
-rw-r--r--AUTHORS1
1 files changed, 1 insertions, 0 deletions
diff --git a/AUTHORS b/AUTHORS
index d450aa7..2a93a29 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -61,6 +61,7 @@ Minor contributors (<= 30 commits, sorted alphabetically):
* Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
* Tommy Beadle <tbeadle@gmail.com>
* Ulrich Weber <uweber@astaro.com>
+ * Whang Choi <wch0x01@gmail.com>
* wilson <wilson.wen.chn@gmail.com>
* Yousong Zhou <yszhou4tech@gmail.com>
* Zhouyang Jia <jiazhouyang09@gmail.com>
amp;id=3efa70d78f218e4c9276b0bac0545e5184c1c47b&id2=926af6273fc683cd98cd0ce7bf0d04a02eed6742'>diff)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
The conflict was an interaction between a bug fix in the netvsc driver in 'net' and an optimization of the RX path in 'net-next'. Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'tools/perf/Documentation/manpage-1.72.xsl')