diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-07-30 14:42:18 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-07-30 14:42:18 +1000 |
| commit | d343a6b0c7c17e286e9b3ed4daf64ebbc36e9b7b (patch) | |
| tree | 159f3ff128790f796ad13edfbae823691a89ba47 /scripts | |
| parent | 509f79af220cd4d169bb061dad0ed97997087cc0 (diff) | |
| parent | d31e373d077848f5d40abd8621b4ebd4d2179dd7 (diff) | |
Merge remote-tracking branch 'trivial/for-next'
Conflicts:
Documentation/laptops/freefall.c
arch/arm/mach-msm/Kconfig
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/Makefile.modinst | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/Makefile.modinst b/scripts/Makefile.modinst index ecbb44797e28..95ec7b35e8b6 100644 --- a/scripts/Makefile.modinst +++ b/scripts/Makefile.modinst @@ -31,6 +31,6 @@ $(modules): # Declare the contents of the .PHONY variable as phony. We keep that -# information in a variable se we can use it in if_changed and friends. +# information in a variable so we can use it in if_changed and friends. .PHONY: $(PHONY) |