- Update to 3.4-rc6.
authorJeff Mahoney <jeffm@suse.com>
Mon, 7 May 2012 17:54:14 +0000 (13:54 -0400)
committerJeff Mahoney <jeffm@suse.com>
Mon, 7 May 2012 17:54:14 +0000 (13:54 -0400)
  - Eliminated 2 patches.

suse-commit: 749ea8f9e366dea70a04e209ba5339498625745f

15 files changed:
1  2 
Makefile
arch/x86/Kconfig
arch/x86/kernel/cpu/amd.c
drivers/acpi/scan.c
drivers/gpu/drm/i915/intel_display.c
drivers/gpu/drm/nouveau/nouveau_acpi.c
drivers/gpu/drm/radeon/radeon_device.c
drivers/input/mouse/synaptics.c
drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c
drivers/net/ethernet/ibm/ehea/ehea_main.c
drivers/net/wireless/b43/main.c
drivers/scsi/scsi_lib.c
drivers/tty/vt/keyboard.c
fs/namei.c
include/linux/efi.h

diff --cc Makefile
Simple merge
@@@ -78,10 -78,10 +78,10 @@@ config X8
        select IRQ_FORCED_THREADING
        select USE_GENERIC_SMP_HELPERS if SMP
        select HAVE_BPF_JIT if (X86_64 && NET)
 -      select CLKEVT_I8253
 +      select CLKEVT_I8253 if !XEN
        select ARCH_HAVE_NMI_SAFE_CMPXCHG
        select GENERIC_IOMAP
-       select DCACHE_WORD_ACCESS if !DEBUG_PAGEALLOC
+       select DCACHE_WORD_ACCESS
  
  config INSTRUCTION_DECODER
        def_bool (KPROBES || PERF_EVENTS)
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc fs/namei.c
Simple merge
Simple merge