Merge branch 'master' into v2.6.31-branch

Conflicts:
	patches.suse/e1000e_allow_bad_checksum
	patches.suse/e1000e_call_dump_eeprom
	patches.suse/e1000e_use_set_memory_ro-rw_to_protect_flash_memory

suse-commit: 185ab7e09f1d0f819ed294f255d28d9030b9e265

diff --cc .gitignore
Simple merge

diff --cc Makefile
index 15674ca,f50a567..b6d8fd7
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -1238,8 -1250,9 +1242,9 @@@ clean: archclean $(clean-dirs
                \( -name '*.[oas]' -o -name '*.ko' -o -name '.*.cmd' \
                -o -name '.*.d' -o -name '.*.tmp' -o -name '*.mod.c' \
                -o -name '*.symtypes' -o -name 'modules.order' \
-               -o -name 'Module.markers' -o -name '.tmp_*.o.*' \
+               -o -name 'modules.builtin' -o -name 'Module.markers' \
 -              -o -name '.tmp_*.o.*' \) \
 -              -type f -print | xargs rm -f
++              -o -name '.tmp_*.o.*' \
 +              -o -name '*.gcno' \) -type f -print | xargs rm -f
  
  # mrproper - Delete all generated files, including .config
  #

diff --cc drivers/net/e1000e/e1000.h
Simple merge

diff --cc drivers/net/e1000e/hw.h
Simple merge

diff --cc drivers/net/e1000e/ich8lan.c
Simple merge

diff --cc drivers/net/e1000e/netdev.c
Simple merge

diff --cc scripts/Makefile.build
Simple merge

diff --cc scripts/Makefile.lib
Simple merge

diff --cc scripts/kconfig/confdata.c
index a04da34,4982aa2..c251a14
--- 1/scripts/kconfig/confdata.c
--- 2/scripts/kconfig/confdata.c
+++ b/scripts/kconfig/confdata.c
@@@ -676,8 -685,8 +691,8 @@@ int conf_write_autoconf(void
  {
        struct symbol *sym;
        const char *str;
 -      char *name;
 +      const char *name;
-       FILE *out, *out_h;
+       FILE *out, *out2, *out_h;
        time_t now;
        int i, l;
  
@@@ -779,7 -802,14 +808,14 @@@
                name = "include/linux/autoconf.h";
        if (rename(".tmpconfig.h", name))
                return 1;
++
+       name = getenv("KCONFIG_AUTOCONFIG2");
+       if (!name)
+               name = "include/config/auto2.conf";
+       if (rename(".tmpconfig2", name))
+               return 1;
 -      name = getenv("KCONFIG_AUTOCONFIG");
 -      if (!name)
 -              name = "include/config/auto.conf";
++
 +      name = conf_get_autoconfig_name();
        /*
         * This must be the last step, kbuild has a dependency on auto.conf
         * and this marks the successful completion of the previous steps.

diff --cc scripts/mod/modpost.c
Simple merge