Merge commit 'v2.6.31-rc8' into rebase/master

* commit 'v2.6.31-rc8': (344 commits)
  Linux 2.6.31-rc8
  module: workaround duplicate section names
  module: fix BUG_ON() for powerpc (and other function descriptor archs)
  xenfb: connect to backend before registering fb
  lmb: Remove __init from lmb_end_of_DRAM()
  ipv4: make ip_append_data() handle NULL routing table
  AFS: Stop readlink() on AFS crashing due to NULL 'file' ptr
  inotify: Ensure we alwasy write the terminating NULL.
  inotify: fix locking around inotify watching in the idr
  inotify: do not BUG on idr entries at inotify destruction
  inotify: seperate new watch creation updating existing watches
  powerpc/ps3: Update ps3_defconfig
  powerpc/ps3: Add missing check for PS3 to rtc-ps3 platform device registration
  leds: after setting inverted attribute, we must update the LED
  leds: fix multiple requests and releases of IRQ for GPIO LED Trigger
  acpi processor: remove superfluous warning message
  ACPI processor: force throttling state when BIOS returns incorrect value
  wmi: fix kernel panic when stack protection enabled.
  acpi: don't call acpi_processor_init if acpi is disabled
  thermal_sys: check get_temp return value
  ...

Conflicts:
	arch/x86/xen/Makefile
	arch/x86/xen/enlighten.c

diff --cc arch/x86/include/asm/pgtable.h
Simple merge

diff --cc arch/x86/kernel/process.c
Simple merge

diff --cc arch/x86/mm/pat.c
Simple merge

diff --cc arch/x86/mm/tlb.c
Simple merge

diff --cc arch/x86/xen/enlighten.c
index b2ec1221bf65573d03a581610c57b55a5ce8c228,e90540a46a0bca9ed06d03672010eb19ef648b24..7119d45324d6c740467dbcc8701d195f1e291082
--- 1/arch/x86/xen/enlighten.c
--- 2/arch/x86/xen/enlighten.c
+++ b/arch/x86/xen/enlighten.c
@@@ -1153,10 -1018,17 +1153,8 @@@ asmlinkage void __init xen_start_kernel
  
        xen_smp_init();
  
 -      /* Get mfn list */
 -      if (!xen_feature(XENFEAT_auto_translated_physmap))
 -              xen_build_dynamic_phys_to_machine();
 -
        pgd = (pgd_t *)xen_start_info->pt_base;
  
-       __supported_pte_mask |= _PAGE_IOMAP;
 -      /* Prevent unwanted bits from being set in PTEs. */
 -      __supported_pte_mask &= ~_PAGE_GLOBAL;
 -      if (!xen_initial_domain())
 -              __supported_pte_mask &= ~(_PAGE_PWT | _PAGE_PCD);
--
  #ifdef CONFIG_X86_64
        /* Work out if we support NX */
        check_efer();

diff --cc drivers/acpi/processor_core.c
Simple merge

diff --cc drivers/acpi/processor_idle.c
Simple merge

diff --cc drivers/net/Kconfig
Simple merge

diff --cc include/acpi/processor.h
Simple merge

diff --cc kernel/irq/manage.c
Simple merge

diff --cc mm/page_alloc.c
Simple merge