diff --git a/[refs] b/[refs] index d36536c2de1d..c2e13fc9b5cb 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c7bb349e7c25df1ae1bbb72675b9bb02e1d9c464 +refs/heads/master: fe8d0a41081d6d0912386f3672ccc0bf1d675630 diff --git a/trunk/Makefile b/trunk/Makefile index e5ad5fd96177..3e95d454285c 100644 --- a/trunk/Makefile +++ b/trunk/Makefile @@ -567,7 +567,7 @@ KBUILD_CFLAGS += $(call cc-option,-Wdeclaration-after-statement,) # disable pointer signed / unsigned warnings in gcc 4.0 KBUILD_CFLAGS += $(call cc-option,-Wno-pointer-sign,) -# disable invalid "can't wrap" optimzations for signed / pointers +# disable invalid "can't wrap" optimizations for signed / pointers KBUILD_CFLAGS += $(call cc-option,-fwrapv) # revert to pre-gcc-4.4 behaviour of .eh_frame @@ -1587,5 +1587,5 @@ PHONY += FORCE FORCE: # 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)