add smart charge from samsung
sensors fix

Conflicts:
	drivers/sensorhub/ssp_firmware.c
disable all debuggers

Conflicts:
	arch/arm/configs/jf_defconfig
	arch/arm/mach-msm/pm-8x60.c
	drivers/video/msm/mipi_dsi_host.c
disable rooting restrictions
disable Gentle Fair Sleepers from broodplank
Linux 3.4.1

Conflicts:
	arch/powerpc/kernel/idle.c
	arch/s390/mm/fault.c
	arch/sparc/Kconfig
	arch/sparc/kernel/systbls_64.S
	arch/tile/include/asm/bitops.h
Linux 3.4.2

Conflicts:
	arch/ia64/include/asm/Kbuild
	arch/microblaze/Kconfig
	arch/mips/include/asm/mach-bcm63xx/bcm63xx_gpio.h
	arch/parisc/kernel/entry.S
	arch/parisc/kernel/vmlinux.lds.S
Linux 3.4.3

Conflicts:
	arch/powerpc/kernel/module_32.c
	arch/powerpc/kernel/time.c
Linux 3.4.4

Conflicts:
	arch/powerpc/include/asm/hw_irq.h
Linux 3.4.5

Conflicts:
	arch/powerpc/kernel/irq.c
	arch/powerpc/kvm/book3s_hv_rmhandlers.S
	arch/powerpc/mm/numa.c
	arch/powerpc/platforms/cell/pervasive.c
	arch/powerpc/platforms/pseries/iommu.c
	arch/powerpc/platforms/pseries/processor_idle.c
	arch/powerpc/xmon/xmon.c
Linux 3.4.6
Linux 3.4.7

Conflicts:
	arch/mips/include/asm/thread_info.h
	arch/mips/kernel/vmlinux.lds.S
Linux 3.4.8

Conflicts:
	arch/m68k/include/asm/entry.h
	arch/m68k/kernel/sys_m68k.c
	arch/mips/kernel/kspd.c
	arch/powerpc/boot/dts/p1022ds.dtsi
	arch/powerpc/include/asm/reg.h
	arch/powerpc/kernel/ftrace.c
	arch/powerpc/platforms/85xx/p1022_ds.c
	arch/powerpc/platforms/pseries/eeh_event.c
	arch/s390/include/asm/mmu_context.h
	arch/s390/include/asm/processor.h
	arch/s390/kernel/processor.c
	arch/s390/kernel/smp.c
	arch/s390/mm/mmap.c
	arch/s390/mm/pgtable.c
Linux 3.4.9

Conflicts:
	arch/ia64/include/asm/atomic.h
	arch/ia64/kernel/irq_ia64.c
ext4-resize: Remove unused var
Linux 3.4.10

Conflicts:
	arch/s390/kernel/compat_linux.c
	arch/s390/kernel/compat_wrapper.S
Linux 3.4.11

Conflicts:
	arch/alpha/include/asm/fpu.h
	arch/alpha/include/asm/socket.h
	arch/parisc/include/asm/atomic.h
	arch/powerpc/kernel/asm-offsets.c
	arch/powerpc/kernel/dbell.c
	arch/powerpc/kernel/entry_64.S
	arch/powerpc/kernel/process.c
	arch/powerpc/kernel/smp.c
	arch/powerpc/kernel/sysfs.c
	arch/powerpc/kernel/traps.c
	arch/powerpc/sysdev/xics/icp-hv.c
Linux 3.4.12

Conflicts:
	arch/alpha/include/asm/atomic.h
	arch/arm/kernel/traps.c
	arch/mips/mm/gup.c
	arch/s390/oprofile/init.c
Linux 3.4.13
Linux 3.4.14

Conflicts:
	arch/alpha/kernel/process.c
	arch/cris/kernel/process.c
	arch/frv/kernel/process.c
	arch/h8300/kernel/process.c
	arch/ia64/kernel/process.c
	arch/m32r/kernel/process.c
	arch/m68k/kernel/process.c
	arch/mips/Makefile
	arch/mips/kernel/Makefile
	arch/mn10300/Makefile
	arch/mn10300/kernel/process.c
	arch/parisc/kernel/process.c
	arch/powerpc/include/asm/pci-bridge.h
	arch/powerpc/platforms/pseries/eeh.c
	arch/score/kernel/process.c