Refresh from git

This commit is contained in:
Josh Boyer 2015-05-13 08:51:43 -04:00
parent 197b945cff
commit 14c000747b
3 changed files with 4 additions and 4 deletions

View File

@ -43,7 +43,7 @@ Signed-off-by: Josh Stone <jistone@redhat.com>
2 files changed, 21 insertions(+), 1 deletion(-)
diff --git a/Makefile b/Makefile
index 0649a6011a76..2c07988a4f10 100644
index dc9f43a019d6..89b47324c032 100644
--- a/Makefile
+++ b/Makefile
@@ -706,7 +706,11 @@ KBUILD_CFLAGS += -fomit-frame-pointer

View File

@ -15,10 +15,10 @@ Signed-off-by: Josh Boyer <jwboyer@fedoraproject.org>
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index bfcb1a62a7b4..a1d62e9ed29b 100644
index 4d68ec841304..77b2fb4125ef 100644
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -3822,7 +3822,7 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
@@ -3824,7 +3824,7 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
the allocated input device; If set to 0, video driver
will only send out the event without touching backlight
brightness level.

View File

@ -22,7 +22,7 @@ Signed-off-by: Lukas Czerner <lczerner@redhat.com>
1 file changed, 19 insertions(+), 12 deletions(-)
diff --git a/fs/ext4/extents.c b/fs/ext4/extents.c
index bed43081720f..aa522429b751 100644
index 16f6365f65e7..30dee3c0e864 100644
--- a/fs/ext4/extents.c
+++ b/fs/ext4/extents.c
@@ -4803,12 +4803,6 @@ static long ext4_zero_range(struct file *file, loff_t offset,