2.6.15

diff --git a/Makefile b/Makefile
index 1fa7e53..497884d 100644
--- a/Makefile
+++ b/Makefile
@@ -1,8 +1,8 @@
 VERSION = 2
 PATCHLEVEL = 6
-SUBLEVEL = 14
+SUBLEVEL = 15
 EXTRAVERSION =
-NAME=Affluent Albatross
+NAME=Sliding Snow Leopard
 
 # *DOCUMENTATION*
 # To see a list of typical targets execute "make help"
@@ -168,7 +168,8 @@ KERNELRELEASE=$(VERSION).$(PATCHLEVEL).$
 
 SUBARCH := $(shell uname -m | sed -e s/i.86/i386/ -e s/sun4u/sparc64/ \
               -e s/arm.*/arm/ -e s/sa110/arm/ \
-              -e s/s390x/s390/ -e s/parisc64/parisc/ )
+              -e s/s390x/s390/ -e s/parisc64/parisc/ \
+              -e s/ppc64/powerpc/ )
 
 # Cross compiling and selecting different set of gcc/bin-utils
 # ---------------------------------------------------------------------------
@@ -334,7 +335,7 @@ KALLSYMS   = scripts/kallsyms
 PERL      = perl
 CHECK      = sparse
 
-CHECKFLAGS     := -D__linux__ -Dlinux -D__STDC__ -Dunix -D__unix__ $(CF)
+CHECKFLAGS     := -D__linux__ -Dlinux -D__STDC__ -Dunix -D__unix__ -Wbitwise $(CF)
 MODFLAGS   = -DMODULE
 CFLAGS_MODULE   = $(MODFLAGS)
 AFLAGS_MODULE   = $(MODFLAGS)
@@ -346,7 +347,8 @@ AFLAGS_KERNEL   =
 # Use LINUXINCLUDE when you must reference the include/ directory.
 # Needed to be compatible with the O= option
 LINUXINCLUDE    := -Iinclude \
-                   $(if $(KBUILD_SRC),-Iinclude2 -I$(srctree)/include)
+                   $(if $(KBUILD_SRC),-Iinclude2 -I$(srctree)/include) \
+         -include include/linux/autoconf.h
 
 CPPFLAGS        := -D__KERNEL__ $(LINUXINCLUDE)
 
@@ -371,8 +373,8 @@ export MODVERDIR := $(if $(KBUILD_EXTMOD
 
 # Files to ignore in find ... statements
 
-RCS_FIND_IGNORE := \( -name SCCS -o -name BitKeeper -o -name .svn -o -name CVS -o -name .pc -o -name .hg \) -prune -o
-export RCS_TAR_IGNORE := --exclude SCCS --exclude BitKeeper --exclude .svn --exclude CVS --exclude .pc --exclude .hg
+RCS_FIND_IGNORE := \( -name SCCS -o -name BitKeeper -o -name .svn -o -name CVS -o -name .pc -o -name .hg -o -name .git \) -prune -o
+export RCS_TAR_IGNORE := --exclude SCCS --exclude BitKeeper --exclude .svn --exclude CVS --exclude .pc --exclude .hg --exclude .git
 
 # ===========================================================================
 # Rules shared between *config targets and build targets
@@ -582,7 +584,7 @@ export MODLIB
 
 
 ifeq ($(KBUILD_EXTMOD),)
-core-y      += kernel/ mm/ fs/ ipc/ security/ crypto/
+core-y      += kernel/ mm/ fs/ ipc/ security/ crypto/ block/
 
 vmlinux-dirs   := $(patsubst %/,%,$(filter %/, $(init-y) $(init-m) \
            $(core-y) $(core-m) $(drivers-y) $(drivers-m) \
@@ -1191,6 +1193,17 @@ else
 __srctree = $(srctree)/
 endif
 
+ifeq ($(ALLSOURCE_ARCHS),)
+ifeq ($(ARCH),um)
+ALLINCLUDE_ARCHS := $(ARCH) $(SUBARCH)
+else
+ALLINCLUDE_ARCHS := $(ARCH)
+endif
+else
+#Allow user to specify only ALLSOURCE_PATHS on the command line, keeping existing behaviour.
+ALLINCLUDE_ARCHS := $(ALLSOURCE_ARCHS)
+endif
+
 ALLSOURCE_ARCHS := $(ARCH)
 
 define all-sources
@@ -1206,7 +1219,7 @@ define all-sources
      find $(__srctree)include $(RCS_FIND_IGNORE) \
           \( -name config -o -name 'asm-*' \) -prune \
           -o -name '*.[chS]' -print; \
-     for ARCH in $(ALLSOURCE_ARCHS) ; do \
+     for ARCH in $(ALLINCLUDE_ARCHS) ; do \
           find $(__srctree)include/asm-$${ARCH} $(RCS_FIND_IGNORE) \
                -name '*.[chS]' -print; \
      done ; \
@@ -1249,11 +1262,6 @@ tags: FORCE
 # Scripts to check various things for consistency
 # ---------------------------------------------------------------------------
 
-configcheck:
-   find * $(RCS_FIND_IGNORE) \
-      -name '*.[hcS]' -type f -print | sort \
-      | xargs $(PERL) -w scripts/checkconfig.pl
-
 includecheck:
    find * $(RCS_FIND_IGNORE) \
       -name '*.[hcS]' -type f -print | sort \