Merge branch 'linux-2.6'

This commit is contained in:
Paul Mackerras
2008-09-10 11:36:13 +10:00
1325 changed files with 38184 additions and 14629 deletions

View File

@@ -2,7 +2,7 @@ CFLAGS_bootx_init.o += -fPIC
ifdef CONFIG_FTRACE
# Do not trace early boot code
CFLAGS_REMOVE_bootx_init.o = -pg
CFLAGS_REMOVE_bootx_init.o = -pg -mno-sched-epilog
endif
obj-y += pic.o setup.o time.o feature.o pci.o \