diff options
| author | H. Peter Anvin <hpa@linux.intel.com> | 2014-06-18 15:26:19 -0700 | 
|---|---|---|
| committer | H. Peter Anvin <hpa@linux.intel.com> | 2014-06-18 15:26:19 -0700 | 
| commit | 03ab3da3b215bac4ebb093c808d54596e03e3225 (patch) | |
| tree | a42534bb7f314b561b362ad0b5af7eff8dbb9726 /scripts/patch-kernel | |
| parent | 6229ad278ca74acdbc8bd3a3d469322a3de91039 (diff) | |
| parent | 7171511eaec5bf23fb06078f59784a3a0626b38f (diff) | |
Merge tag 'v3.16-rc1' into x86/cpufeature
Linux 3.16-rc1
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
Diffstat (limited to 'scripts/patch-kernel')
| -rwxr-xr-x | scripts/patch-kernel | 4 | 
1 files changed, 2 insertions, 2 deletions
| diff --git a/scripts/patch-kernel b/scripts/patch-kernel index d000ea3a41fd..49b4241e814a 100755 --- a/scripts/patch-kernel +++ b/scripts/patch-kernel @@ -27,7 +27,7 @@  #       Nick Holloway <Nick.Holloway@alfie.demon.co.uk>, 2nd January 1995.  #  # Added support for handling multiple types of compression. What includes -# gzip, bzip, bzip2, zip, compress, and plaintext.  +# gzip, bzip, bzip2, zip, compress, and plaintext.  #  #       Adam Sulmicki <adam@cfar.umd.edu>, 1st January 1997.  # @@ -159,7 +159,7 @@ applyPatch () {    fi    # Remove backup files    find $sourcedir/ '(' -name '*.orig' -o -name '.*.orig' ')' -exec rm -f {} \; -  +    return 0;  } | 
