Merge branches 'delete-gts-bfs', 'misc', 'novell-bugzilla-757888-numa' and 'osc-pcie...

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

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

diff --cc drivers/acpi/sleep.c
index bd35e3c5e53022a819d9d684cd4cb8cab1dfeeea,dca8074b6704860a72aea58ee59bc9055975417d,7a7a9c929247e6faaecbeca3c9863f02abc1c283,23a53c013f1eb6e594591189deb83c4e3f749301..fdcdbb652915a32340d91a7d6e6fcce15c3ee602
--- 1/drivers/acpi/sleep.c
--- 2/drivers/acpi/sleep.c
--- 3/drivers/acpi/sleep.c
--- 4/drivers/acpi/sleep.c
+++ b/drivers/acpi/sleep.c
@@@@@ -28,8 -28,35 -28,36 -28,36 +28,7 @@@@@
    #include "internal.h"
    #include "sleep.h"
    
 ---u8 wake_sleep_flags = ACPI_NO_OPTIONAL_METHODS;
 ---static unsigned int gts, bfs;
 ---static int set_param_wake_flag(const char *val, struct kernel_param *kp)
 ---{
 ---    int ret = param_set_int(val, kp);
 ---
 ---    if (ret)
 ---            return ret;
 ---
 ---    if (kp->arg == (const char *)&gts) {
 ---            if (gts)
 ---                    wake_sleep_flags |= ACPI_EXECUTE_GTS;
 ---            else
 ---                    wake_sleep_flags &= ~ACPI_EXECUTE_GTS;
 ---    }
 ---    if (kp->arg == (const char *)&bfs) {
 ---            if (bfs)
 ---                    wake_sleep_flags |= ACPI_EXECUTE_BFS;
 ---            else
 ---                    wake_sleep_flags &= ~ACPI_EXECUTE_BFS;
 ---    }
 ---    return ret;
 ---}
 ---module_param_call(gts, set_param_wake_flag, param_get_int, &gts, 0644);
 ---module_param_call(bfs, set_param_wake_flag, param_get_int, &bfs, 0644);
 ---MODULE_PARM_DESC(gts, "Enable evaluation of _GTS on suspend.");
 ---MODULE_PARM_DESC(bfs, "Enable evaluation of _BFS on resume".);
 ---
    static u8 sleep_states[ACPI_S_STATE_COUNT];
- --static bool pwr_btn_event_pending;
    
    static void acpi_sleep_tts_switch(u32 acpi_state)
    {