diff options
| author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2012-04-15 15:28:57 -0400 |
|---|---|---|
| committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2012-04-15 15:28:57 -0400 |
| commit | 2d3671bebaea24768cf443822959122efaeb8208 (patch) | |
| tree | 3416c55af4ccffd1111b70ce02dc788da1aa0a76 | |
| parent | 8b4ff6d4cbaa4ff8bc3c757215148783aa82ce07 (diff) | |
| download | 3.4-rt-patches-3.4-rc2-rt4-git-am-fixes.tar.gz | |
git-am: whitespace fixes.3.4-rc2-rt4-git-am-fixes
Two space b4 tab and one newline at EOF that show up when you
git am the series.
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
| -rw-r--r-- | patches/latency-hist.patch | 3 | ||||
| -rw-r--r-- | patches/ping-sysrq.patch | 2 | ||||
| -rw-r--r-- | patches/workqueue-sanity.patch | 2 |
3 files changed, 3 insertions, 4 deletions
diff --git a/patches/latency-hist.patch b/patches/latency-hist.patch index 4866124..3da487a 100644 --- a/patches/latency-hist.patch +++ b/patches/latency-hist.patch @@ -310,7 +310,7 @@ Index: linux-3.4/include/trace/events/latency_hist.h =================================================================== --- /dev/null +++ linux-3.4/include/trace/events/latency_hist.h -@@ -0,0 +1,30 @@ +@@ -0,0 +1,29 @@ +#ifndef _LATENCY_HIST_H +#define _LATENCY_HIST_H + @@ -340,7 +340,6 @@ Index: linux-3.4/include/trace/events/latency_hist.h +} + +#endif /* _LATENCY_HIST_H */ -+ Index: linux-3.4/kernel/hrtimer.c =================================================================== --- linux-3.4.orig/kernel/hrtimer.c diff --git a/patches/ping-sysrq.patch b/patches/ping-sysrq.patch index d6a4b05..ec51dbc 100644 --- a/patches/ping-sysrq.patch +++ b/patches/ping-sysrq.patch @@ -35,7 +35,7 @@ Index: linux-3.2/Documentation/sysrq.txt + echo 0x01020304 >/proc/sys/net/ipv4/icmp_echo_sysrq + Send an ICMP echo request with this pattern plus the particular + SysRq command key. Example: -+ # ping -c1 -s57 -p0102030468 ++ # ping -c1 -s57 -p0102030468 + will trigger the SysRq-H (help) command. + + diff --git a/patches/workqueue-sanity.patch b/patches/workqueue-sanity.patch index 495e943..cca58ec 100644 --- a/patches/workqueue-sanity.patch +++ b/patches/workqueue-sanity.patch @@ -791,7 +791,7 @@ Index: linux-3.2/kernel/workqueue.c - cpu_notifier(workqueue_cpu_callback, CPU_PRI_WORKQUEUE); + cpu_notifier(workqueue_cpu_up_callback, CPU_PRI_WORKQUEUE_ACTIVE); -+ hotcpu_notifier(workqueue_cpu_down_callback, CPU_PRI_WORKQUEUE_INACTIVE); ++ hotcpu_notifier(workqueue_cpu_down_callback, CPU_PRI_WORKQUEUE_INACTIVE); /* initialize gcwqs */ for_each_gcwq_cpu(cpu) { |