wacom: driver and e-pen firmware updates (7a4756d)

Conflicts:
	drivers/input/touchscreen/wacom/wacom_i2c_flash.c
	firmware/Makefile
	firmware/epen/W9001_B746L.bin.ihex
	firmware/epen/W9001_B746S.bin.ihex
	firmware/epen/W9001_B746VZW.bin.ihex
wacom/cypress-touchkey: wacom sysfs additions and touchkey block

- a bunch of additional sysfs entries for the wacom driver
- wacom booster is now configurable
- touchkeys are locked when epen is within hovering range
- adjustable x,y offset

Conflicts:
	drivers/input/keyboard/cypress/cypress-touchkey.c
wacom: reset touchkey lockout when pen is inserted/removed
mm/ashmem.c: fixed a typo introduced by samsung

Change-Id: I0a176001bda2683135939ea455e8cbc6421c98a6
mm: break up swap_writepage() for frontswap backends

swap_writepage() is currently where frontswap hooks into the swap
write path to capture pages with the frontswap_store() function.
However, if a frontswap backend wants to "resume" the writeback of
a page to the swap device, it can't call swap_writepage() as
the page will simply reenter the backend.

This patch separates swap_writepage() into a top and bottom half, the
bottom half named __swap_writepage() to allow a frontswap backend,
like zswap, to resume writeback beyond the frontswap_store() hook.

__add_to_swap_cache() is also made non-static so that the page for
which writeback is to be resumed can be added to the swap cache.

Signed-off-by: Seth Jennings <sjenning@linux.vnet.ibm.com>
Acked-by: Minchan Kim <minchan@kernel.org>

Conflicts:
	mm/page_io.c
mm: allow for outstanding swap writeback accounting

To prevent flooding the swap device with writebacks, frontswap
backends need to count and limit the number of outstanding
writebacks.  The incrementing of the counter can be done before
the call to __swap_writepage().  However, the caller must receive
a notification when the writeback completes in order to decrement
the counter.

To achieve this functionality, this patch modifies
__swap_writepage() to take the bio completion callback function
as an argument.

end_swap_bio_write(), the normal bio completion function, is also
made non-static so that code doing the accounting can call it
after the accounting is done.

Signed-off-by: Seth Jennings <sjenning@linux.vnet.ibm.com>
Acked-by: Minchan Kim <minchan@kernel.org>
mdnie: toggling mdnie negative effect with home button

pressing home button 4 times will toggle screen negative effect. the delay between consecutive button presses should be less than 300 miliseconds.

Conflicts:
	drivers/input/keyboard/gpio_keys.c

Change-Id: I07e60b2f935bca154ca965f080b5052b56528050

Conflicts:
	drivers/video/samsung/mdnie.c
mdnie: fix negative toggle build error
mdnie: toggle nightmode (red) with home button

- toggle nightmode (red) by pressing the home button 3x as fast as you can
- toggle negative mode by pressing the home button 4x rhythmically

Conflicts:
	drivers/video/samsung/mdnie_table_t0.h
Revert "mm: allow for outstanding swap writeback accounting"

This reverts commit 612e6c575eb551d2d72b446fae750bc87a061283.
Revert "mm: break up swap_writepage() for frontswap backends"

This reverts commit 0b8aac1be6094674e1be5b3771a7a335051e272e.
arch/arm/mach-exynos/cpufreq.c : add max safe startup limit
misc: silence annoying kmsgs

Conflicts:
	drivers/net/usb/rmnet_usb_ctrl.c
cpufreq: match CM10.1, add pm_lock_idx, cleanup, more debug

Conflicts:
	arch/arm/mach-exynos/cpufreq.c
cpufreq: add exynos_cpufreq_get_level()
cpufreq: add exynos_cpufreq_get_minfreq()
cpufreq: forgotten cpufreq.h needed by last few commits

needed by: b68c3a7c0efc1d28f9e3a6955dd4ade922012e21
needed by: 28e25a63d0cae7085e6f47ec7f2995299a84e18c
needed by: 6ea13e3ab4337d3c1450131de648cc8320593877
tsp: Port flexrate and lcdfreq_dfs to T0 platform

Conflicts:
	drivers/input/touchscreen/mms152_ts.c
fix last commit
 cpuidle-exynos4: turn logging off