diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-10-29 15:37:12 (GMT) |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-10-29 15:37:12 (GMT) |
| commit | cb1f6268acd7f1bca7153fa9ca187ffb73f60ab8 (patch) | |
| tree | 28695d8b8cbc1876e2e60880f45a502a7ded043d /arch/arm/tools/Makefile | |
| parent | d9ff3934171b5cf1ac17e5fcd39f3f324b4724ce (diff) | |
| parent | 8f0d8163b50e01f398b14bcd4dc039ac5ab18d64 (diff) | |
| download | linux-fsl-qoriq-cb1f6268acd7f1bca7153fa9ca187ffb73f60ab8.tar.xz | |
Merge 3.7-rc3 into staging-next
This resolves the conflict with:
drivers/staging/comedi/drivers/amplc_dio200.c
and syncs up the changes that happened in the staging directory for
3.7-rc3.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/arm/tools/Makefile')
| -rw-r--r-- | arch/arm/tools/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/tools/Makefile b/arch/arm/tools/Makefile index 635cb18..cd60a81 100644 --- a/arch/arm/tools/Makefile +++ b/arch/arm/tools/Makefile @@ -5,6 +5,6 @@ # include/generated/mach-types.h: $(src)/gen-mach-types $(src)/mach-types - @echo ' Generating $@' + $(kecho) ' Generating $@' @mkdir -p $(dir $@) $(Q)$(AWK) -f $^ > $@ || { rm -f $@; /bin/false; } |