summaryrefslogtreecommitdiff
path: root/AUTHORS
diff options
context:
space:
mode:
Diffstat (limited to 'AUTHORS')
-rw-r--r--AUTHORS2
1 files changed, 2 insertions, 0 deletions
diff --git a/AUTHORS b/AUTHORS
index edd698f..b2f5fde 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -6,6 +6,7 @@ commits in the netsniff-ng repository:
* Christian Wiese <chris@opensde.org>
* Daniel Borkmann <daniel@iogearbox.net>
* Daniel Roberson <daniel@planethacker.net>
+ * Daniel Roggow <daniel.roggow@rockwellcollins.com>
* Eric Dumazet <edumazet@google.com>
* Erik Bengtsson <e.bengtsson@gmail.com>
* Hideo Hattori <hhatto.jp@gmail.com>
@@ -43,6 +44,7 @@ commits in the netsniff-ng repository:
* Whang Choi <wch0x01@gmail.com>
* wilson <wilson.wen.chn@gmail.com>
* Yousong Zhou <yszhou4tech@gmail.com>
+
The following people have provided helpful bug reports, suggestions or have
otherwise provided valuable contributions to the project:
9a2afc9d7c279b880dfcac8f27d513b50'>bed45f79a2afc9d7c279b880dfcac8f27d513b50 (diff)parent1ee18329fae936089c6c599250ae92482ff2b81f (diff)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'arch/arm/boot/dts/imx6q-hummingboard.dts')