Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

Pull input updates from Dmitry Torokhov:

 - a new driver for Rohm BU21029 touch controller

 - new bitmap APIs: bitmap_alloc, bitmap_zalloc and bitmap_free

 - updates to Atmel, eeti. pxrc and iforce drivers

 - assorted driver cleanups and fixes.

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: (57 commits)
  MAINTAINERS: Add PhoenixRC Flight Controller Adapter
  Input: do not use WARN() in input_alloc_absinfo()
  Input: mark expected switch fall-throughs
  Input: raydium_i2c_ts - use true and false for boolean values
  Input: evdev - switch to bitmap API
  Input: gpio-keys - switch to bitmap_zalloc()
  Input: elan_i2c_smbus - cast sizeof to int for comparison
  bitmap: Add bitmap_alloc(), bitmap_zalloc() and bitmap_free()
  md: Avoid namespace collision with bitmap API
  dm: Avoid namespace collision with bitmap API
  Input: pm8941-pwrkey - add resin entry
  Input: pm8941-pwrkey - abstract register offsets and event code
  Input: iforce - reorganize joystick configuration lists
  Input: atmel_mxt_ts - move completion to after config crc is updated
  Input: atmel_mxt_ts - don't report zero pressure from T9
  Input: atmel_mxt_ts - zero terminate config firmware file
  Input: atmel_mxt_ts - refactor config update code to add context struct
  Input: atmel_mxt_ts - config CRC may start at T71
  Input: atmel_mxt_ts - remove unnecessary debug on ENOMEM
  Input: atmel_mxt_ts - remove duplicate setup of ABS_MT_PRESSURE
  ...

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/input/joystick/joydump.c
Simple merge

diff --cc drivers/input/touchscreen/Kconfig
Simple merge

diff --cc drivers/input/touchscreen/Makefile
Simple merge

diff --cc drivers/md/dm-raid.c
Simple merge

diff --cc drivers/md/md-bitmap.c
index f983c3fdf204169564ad64ee789e9961e3b47bec,712a20c4608cb0f03735e59b373ad6d0e53b4f68..2fc8c113977fbec7877220e034dd34561399741b
--- 1/drivers/md/md-bitmap.c
--- 2/drivers/md/md-bitmap.c
+++ b/drivers/md/md-bitmap.c
@@@ -2117,10 -2115,10 +2115,10 @@@ int md_bitmap_resize(struct bitmap *bit
  
        pages = DIV_ROUND_UP(chunks, PAGE_COUNTER_RATIO);
  
 -      new_bp = kzalloc(pages * sizeof(*new_bp), GFP_KERNEL);
 +      new_bp = kcalloc(pages, sizeof(*new_bp), GFP_KERNEL);
        ret = -ENOMEM;
        if (!new_bp) {
-               bitmap_file_unmap(&store);
+               md_bitmap_file_unmap(&store);
                goto err;
        }
  

diff --cc drivers/md/md-cluster.c
Simple merge

diff --cc drivers/md/md.c
Simple merge

diff --cc drivers/md/raid1.c
Simple merge

diff --cc drivers/md/raid10.c
Simple merge

diff --cc drivers/md/raid5-cache.c
Simple merge

diff --cc drivers/md/raid5.c
Simple merge

diff --cc include/xen/interface/io/kbdif.h
Simple merge

diff --cc lib/bitmap.c
Simple merge