deleted:    ..tmp_kallsyms1.o.cmd
	deleted:    ..tmp_kallsyms2.o.cmd
	deleted:    ..tmp_vmlinux1.cmd
	deleted:    ..tmp_vmlinux2.cmd
	deleted:    .missing-syscalls.d
	deleted:    .tmp_System.map
	deleted:    .tmp_kallsyms1.S
	deleted:    .tmp_kallsyms1.o
	deleted:    .tmp_kallsyms2.S
	deleted:    .tmp_kallsyms2.o
	deleted:    .tmp_versions/ansi_cprng.mod
	deleted:    .tmp_versions/bluetooth-power.mod
	deleted:    .tmp_versions/dma_test.mod
	deleted:    .tmp_versions/evbug.mod
	deleted:    .tmp_versions/gspca_main.mod
	deleted:    .tmp_versions/lcd.mod
	deleted:    .tmp_versions/msm-buspm-dev.mod
	deleted:    .tmp_versions/qce40.mod
	deleted:    .tmp_versions/qcedev.mod
	deleted:    .tmp_versions/qcrypto.mod
	deleted:    .tmp_versions/radio-iris-transport.mod
	deleted:    .tmp_versions/reset_modem.mod
	deleted:    .tmp_versions/scsi_wait_scan.mod
	deleted:    .tmp_versions/spidev.mod
	deleted:    .tmp_vmlinux1
	deleted:    .tmp_vmlinux2
	deleted:    .vmlinux.cmd
	deleted:    .vmlinux.o.cmd
	deleted:    System.map
	deleted:    arch/arm/boot/.Image.cmd
	deleted:    arch/arm/boot/.zImage.cmd
	deleted:    arch/arm/boot/Image
	deleted:    arch/arm/boot/compressed/.decompress.o.cmd
	deleted:    arch/arm/boot/compressed/.head.o.cmd
	deleted:    arch/arm/boot/compressed/.lib1funcs.o.cmd
	deleted:    arch/arm/boot/compressed/.misc.o.cmd
	deleted:    arch/arm/boot/compressed/.piggy.gzip.cmd
	deleted:    arch/arm/boot/compressed/.piggy.gzip.o.cmd
	deleted:    arch/arm/boot/compressed/.string.o.cmd
	deleted:    arch/arm/boot/compressed/.vmlinux.cmd
	deleted:    arch/arm/boot/compressed/decompress.o
	deleted:    arch/arm/boot/compressed/head.o
	deleted:    arch/arm/boot/compressed/lib1funcs.S
	deleted:    arch/arm/boot/compressed/lib1funcs.o
	deleted:    arch/arm/boot/compressed/misc.o
	deleted:    arch/arm/boot/compressed/piggy.gzip
	deleted:    arch/arm/boot/compressed/piggy.gzip.o
	deleted:    arch/arm/boot/compressed/string.o
	deleted:    arch/arm/boot/compressed/vmlinux
	deleted:    arch/arm/boot/compressed/vmlinux.lds
	deleted:    arch/arm/boot/zImage
	deleted:    arch/arm/common/.built-in.o.cmd
	deleted:    arch/arm/common/.cpaccess.o.cmd
	deleted:    arch/arm/common/.gic.o.cmd
	deleted:    arch/arm/common/built-in.o
	deleted:    arch/arm/common/cpaccess.o
	deleted:    arch/arm/common/gic.o
	deleted:    arch/arm/common/modules.builtin
	deleted:    arch/arm/common/modules.order
	deleted:    arch/arm/kernel/.armksyms.o.cmd
	deleted:    arch/arm/kernel/.asm-offsets.s.cmd
	deleted:    arch/arm/kernel/.built-in.o.cmd
	deleted:    arch/arm/kernel/.elf.o.cmd
	deleted:    arch/arm/kernel/.entry-armv.o.cmd
	deleted:    arch/arm/kernel/.entry-common.o.cmd
	deleted:    arch/arm/kernel/.head.o.cmd
	deleted:    arch/arm/kernel/.init_task.o.cmd
	deleted:    arch/arm/kernel/.io.o.cmd
	deleted:    arch/arm/kernel/.irq.o.cmd
	deleted:    arch/arm/kernel/.kprobes-decode.o.cmd
	deleted:    arch/arm/kernel/.kprobes.o.cmd
	deleted:    arch/arm/kernel/.module.o.cmd
	deleted:    arch/arm/kernel/.perf_event.o.cmd
	deleted:    arch/arm/kernel/.pmu.o.cmd
	deleted:    arch/arm/kernel/.process.o.cmd
	deleted:    arch/arm/kernel/.ptrace.o.cmd
	deleted:    arch/arm/kernel/.return_address.o.cmd
	deleted:    arch/arm/kernel/.sched_clock.o.cmd
	deleted:    arch/arm/kernel/.setup.o.cmd
	deleted:    arch/arm/kernel/.signal.o.cmd
	deleted:    arch/arm/kernel/.sleep.o.cmd
	deleted:    arch/arm/kernel/.smp.o.cmd
	deleted:    arch/arm/kernel/.smp_scu.o.cmd
	deleted:    arch/arm/kernel/.smp_tlb.o.cmd
	deleted:    arch/arm/kernel/.stacktrace.o.cmd
	deleted:    arch/arm/kernel/.swp_emulate.o.cmd
	deleted:    arch/arm/kernel/.sys_arm.o.cmd
	deleted:    arch/arm/kernel/.sys_oabi-compat.o.cmd
	deleted:    arch/arm/kernel/.time.o.cmd
	deleted:    arch/arm/kernel/.traps.o.cmd
	deleted:    arch/arm/kernel/.unwind.o.cmd
	deleted:    arch/arm/kernel/.vmlinux.lds.cmd
	deleted:    arch/arm/kernel/armksyms.o
	deleted:    arch/arm/kernel/asm-offsets.s
	deleted:    arch/arm/kernel/built-in.o
	deleted:    arch/arm/kernel/elf.o
	deleted:    arch/arm/kernel/entry-armv.o
	deleted:    arch/arm/kernel/entry-common.o
	deleted:    arch/arm/kernel/head.o
	deleted:    arch/arm/kernel/init_task.o
	deleted:    arch/arm/kernel/io.o
	deleted:    arch/arm/kernel/irq.o
	deleted:    arch/arm/kernel/kprobes-decode.o
	deleted:    arch/arm/kernel/kprobes.o
	deleted:    arch/arm/kernel/module.o
	deleted:    arch/arm/kernel/modules.builtin
	deleted:    arch/arm/kernel/modules.order
	deleted:    arch/arm/kernel/perf_event.o
	deleted:    arch/arm/kernel/pmu.o
	deleted:    arch/arm/kernel/process.o
	deleted:    arch/arm/kernel/ptrace.o
	deleted:    arch/arm/kernel/return_address.o
	deleted:    arch/arm/kernel/sched_clock.o
	deleted:    arch/arm/kernel/setup.o
	deleted:    arch/arm/kernel/signal.o
	deleted:    arch/arm/kernel/sleep.o
	deleted:    arch/arm/kernel/smp.o
	deleted:    arch/arm/kernel/smp_scu.o
	deleted:    arch/arm/kernel/smp_tlb.o
	deleted:    arch/arm/kernel/stacktrace.o
	deleted:    arch/arm/kernel/swp_emulate.o
	deleted:    arch/arm/kernel/sys_arm.o
	deleted:    arch/arm/kernel/sys_oabi-compat.o
	deleted:    arch/arm/kernel/time.o
	deleted:    arch/arm/kernel/traps.o
	deleted:    arch/arm/kernel/unwind.o
	deleted:    arch/arm/kernel/vmlinux.lds
	deleted:    arch/arm/lib/.ashldi3.o.cmd
	deleted:    arch/arm/lib/.ashrdi3.o.cmd
	deleted:    arch/arm/lib/.backtrace.o.cmd
	deleted:    arch/arm/lib/.built-in.o.cmd
	deleted:    arch/arm/lib/.changebit.o.cmd
	deleted:    arch/arm/lib/.clear_user.o.cmd
	deleted:    arch/arm/lib/.clearbit.o.cmd
	deleted:    arch/arm/lib/.copy_from_user.o.cmd
	deleted:    arch/arm/lib/.copy_page.o.cmd
	deleted:    arch/arm/lib/.copy_to_user.o.cmd
	deleted:    arch/arm/lib/.csumipv6.o.cmd
	deleted:    arch/arm/lib/.csumpartial.o.cmd
	deleted:    arch/arm/lib/.csumpartialcopy.o.cmd
	deleted:    arch/arm/lib/.csumpartialcopyuser.o.cmd
	deleted:    arch/arm/lib/.delay.o.cmd
	deleted:    arch/arm/lib/.div64.o.cmd
	deleted:    arch/arm/lib/.findbit.o.cmd
	deleted:    arch/arm/lib/.getuser.o.cmd
	deleted:    arch/arm/lib/.io-readsb.o.cmd
	deleted:    arch/arm/lib/.io-readsl.o.cmd
	deleted:    arch/arm/lib/.io-readsw-armv4.o.cmd
	deleted:    arch/arm/lib/.io-writesb.o.cmd
	deleted:    arch/arm/lib/.io-writesl.o.cmd
	deleted:    arch/arm/lib/.io-writesw-armv4.o.cmd
	deleted:    arch/arm/lib/.lib.a.cmd
	deleted:    arch/arm/lib/.lib1funcs.o.cmd
	deleted:    arch/arm/lib/.lshrdi3.o.cmd
	deleted:    arch/arm/lib/.memchr.o.cmd
	deleted:    arch/arm/lib/.memcpy.o.cmd
	deleted:    arch/arm/lib/.memmove.o.cmd
	deleted:    arch/arm/lib/.memset.o.cmd
adding sweep2wake properly after learning on my HTC Ville
adding dependancies for sweep2wake cmdline functions
screenon after sleep is broken right now but everything else seems to be in order for sweep2wake
sweep2wake stuff
sweep2wake: relocate code to the correct position

Conflicts:
	drivers/input/touchscreen/synaptics_3200.c

 Author:    showp1984 <showp1984@gmail.com>
	modified:   drivers/input/touchscreen/synaptics_3200.c
sweep2wake: add initial sweep2wake support

Conflicts:

	drivers/input/keyboard/gpio_keys.c

Conflicts:
	drivers/input/keyboard/gpio_keys.c
	drivers/input/touchscreen/synaptics_3200.c
	include/linux/synaptics_i2c_rmi.h

 Author:    showp1984 <showp1984@gmail.com>
	modified:   drivers/input/keyboard/gpio_keys.c
	modified:   drivers/input/touchscreen/synaptics_3200.c
	modified:   include/config/kernel.release
	modified:   include/generated/utsrelease.h
	modified:   include/linux/synaptics_i2c_rmi.h
starting clean to cherrypick
sweep2wake: add initial sweep2wake support

Conflicts:

	drivers/input/keyboard/gpio_keys.c

Conflicts:
	drivers/input/keyboard/gpio_keys.c
	drivers/input/touchscreen/synaptics_3200.c
	include/linux/synaptics_i2c_rmi.h

Author:    showp1984 <showp1984@gmail.com>
	modified:   drivers/input/touchscreen/synaptics_3200.c
	modified:   include/linux/synaptics_i2c_rmi.h
 Author: Show1984
Input:Synaptics_3200.c Cleaning up after cherry pick
Finishing touchup after cherrypick to Synaptics_3200.c
removal of debug message
Merge branch 'master' of github.com:Team-Blackout/EvilZ.213.BLACKOUT_edition

Conflicts:
	drivers/input/keyboard/gpio_keys.c