Merge remote-tracking branch 'robh/for-next' into devicetree/next

This commit is contained in:
Grant Likely
2015-06-30 14:28:52 +01:00
53 changed files with 1843 additions and 1579 deletions

View File

@@ -2,7 +2,6 @@
# Makefile for the linux kernel.
#
CFLAGS_prom.o = -I$(src)/../../../scripts/dtc/libfdt
CFLAGS_ptrace.o += -DUTS_MACHINE='"$(UTS_MACHINE)"'
subdir-ccflags-$(CONFIG_PPC_WERROR) := -Werror