Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

diff --combined Makefile
index 59b60d5562d3989c692fef2d6e1679054aa8ae44,ad830bd45a4bb727c06d3855073de6ec4367addc..4f7e3ccde05b14cf1b6389dcd660c4406a46dc63
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -1,7 -1,7 +1,7 @@@
  VERSION = 2
  PATCHLEVEL = 6
- SUBLEVEL = 29
- EXTRAVERSION =
+ SUBLEVEL = 30
+ EXTRAVERSION = -rc1
  NAME = Temporary Tasmanian Devil
  
  # *DOCUMENTATION*
@@@ -169,7 -169,7 +169,7 @@@ SUBARCH := $(shell uname -m | sed -e s/
                                  -e s/arm.*/arm/ -e s/sa110/arm/ \
                                  -e s/s390x/s390/ -e s/parisc64/parisc/ \
                                  -e s/ppc.*/powerpc/ -e s/mips.*/mips/ \
 -                                -e s/sh.*/sh/ )
 +                                -e s/sh[234].*/sh/ )
  
  # Cross compiling and selecting different set of gcc/bin-utils
  # ---------------------------------------------------------------------------
@@@ -210,11 -210,6 +210,11 @@@ ifeq ($(ARCH),sparc64
         SRCARCH := sparc
  endif
  
 +# Additional ARCH settings for sh
 +ifeq ($(ARCH),sh64)
 +       SRCARCH := sh
 +endif
 +
  # Where to locate arch specific headers
  hdr-arch  := $(SRCARCH)
  
@@@ -572,7 -567,7 +572,7 @@@ KBUILD_CFLAGS += $(call cc-option,-Wdec
  # 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
@@@ -602,6 -597,10 +602,10 @@@ LDFLAGS_BUILD_ID = $(patsubst -Wl$(comm
  LDFLAGS_MODULE += $(LDFLAGS_BUILD_ID)
  LDFLAGS_vmlinux += $(LDFLAGS_BUILD_ID)
  
+ ifeq ($(CONFIG_STRIP_ASM_SYMS),y)
+ LDFLAGS_vmlinux       += -X
+ endif
+ 
  # Default kernel image to build when no specific target is given.
  # KBUILD_IMAGE may be overruled on the command line or
  # set in the environment
@@@ -1592,5 -1591,5 +1596,5 @@@ PHONY += FORC
  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)