aboutsummaryrefslogtreecommitdiffstats
path: root/tools/gpio/gpio-event-mon.c
diff options
context:
space:
mode:
authorThomas Gleixner <[email protected]>2016-09-01 16:33:46 +0000
committerThomas Gleixner <[email protected]>2016-09-01 16:33:46 +0000
commit0cb7bf61b1e9f05027de58c80f9b46a714d24e35 (patch)
tree41fb55cf62d07b425122f9a8b96412c0d8eb99c5 /tools/gpio/gpio-event-mon.c
parentcpu/hotplug: Prevent alloc/free of irq descriptors during CPU up/down (again) (diff)
parentLinux 4.8-rc4 (diff)
downloadkernel-0cb7bf61b1e9f05027de58c80f9b46a714d24e35.tar.gz
kernel-0cb7bf61b1e9f05027de58c80f9b46a714d24e35.zip
Merge branch 'linus' into smp/hotplug
Apply upstream changes to avoid conflicts with pending patches.
Diffstat (limited to 'tools/gpio/gpio-event-mon.c')
-rw-r--r--tools/gpio/gpio-event-mon.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/gpio/gpio-event-mon.c b/tools/gpio/gpio-event-mon.c
index 448ed96b3b4f..1c14c2595158 100644
--- a/tools/gpio/gpio-event-mon.c
+++ b/tools/gpio/gpio-event-mon.c
@@ -1,5 +1,5 @@
/*
- * gpio-hammer - example swiss army knife to shake GPIO lines on a system
+ * gpio-event-mon - monitor GPIO line events from userspace
*
* Copyright (C) 2016 Linus Walleij
*