lisa/android_kernel_xiaomi_sm8350
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
c3ed9ea4ab
android_kernel_xiaomi_sm8350/drivers/input/misc
History
Grant Likely cf9b59e9d3 Merge remote branch 'origin' into secretlab/next-devicetree 
Merging in current state of Linus' tree to deal with merge conflicts and
build failures in vio.c after merge.

Conflicts:
	drivers/i2c/busses/i2c-cpm.c
	drivers/i2c/busses/i2c-mpc.c
	drivers/net/gianfar.c

Also fixed up one line in arch/powerpc/kernel/vio.c to use the
correct node pointer.

Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
2010-05-22 00:36:56 -06:00
..
88pm860x_onkey.c Input: 88pm860x_onkey - remove invalid irq number assignment 2010-05-19 10:14:10 -07:00
ad714x-i2c.c Input: ad714x - add support for the AD7143/8/7A parts 2010-04-13 23:27:22 -07:00
ad714x-spi.c Input: add Analog Devices AD714x captouch input driver 2010-04-13 23:27:16 -07:00
ad714x.c Input: ad714x - add support for the AD7143/8/7A parts 2010-04-13 23:27:22 -07:00
ad714x.h Input: add Analog Devices AD714x captouch input driver 2010-04-13 23:27:16 -07:00
apanel.c Input: make i2c device ids constant 2010-01-09 23:28:33 -08:00
ati_remote2.c USB: rename usb_buffer_alloc() and usb_buffer_free() users 2010-05-20 13:21:38 -07:00
ati_remote.c USB: rename usb_buffer_alloc() and usb_buffer_free() users 2010-05-20 13:21:38 -07:00
atlas_btns.c ACPI: replace acpi_integer by u64 2010-01-28 01:47:33 -05:00
bfin_rotary.c include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00
cm109.c USB: rename usb_buffer_alloc() and usb_buffer_free() users 2010-05-20 13:21:38 -07:00
cobalt_btns.c include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00
dm355evm_keys.c include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00
hp_sdc_rtc.c Merge branch 'bkl-drivers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip 2009-12-09 08:07:38 -08:00
ixp4xx-beeper.c [ARM] Move include/asm-arm/arch-* to arch/arm/*/include/mach 2008-08-07 09:55:48 +01:00
Kconfig Input: ad714x - add support for the AD7143/8/7A parts 2010-04-13 23:27:22 -07:00
keyspan_remote.c USB: rename usb_buffer_alloc() and usb_buffer_free() users 2010-05-20 13:21:38 -07:00
m68kspkr.c get rid of input BIT* duplicate defines 2007-10-19 11:53:42 -07:00
Makefile Input: add Analog Devices AD714x captouch input driver 2010-04-13 23:27:16 -07:00
pcap_keys.c include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00
pcf8574_keypad.c Input: add PCF8574 I2C keypad input device driver 2010-04-13 23:25:10 -07:00
pcf50633-input.c include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00
pcspkr.c i8253: Convert i8253_lock to raw_spinlock 2010-03-02 10:28:38 +01:00
powermate.c USB: rename usb_buffer_alloc() and usb_buffer_free() users 2010-05-20 13:21:38 -07:00
rb532_button.c Input: add driver for S1 button of rb532 2009-03-09 20:10:12 -07:00
rotary_encoder.c include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00
sgi_btns.c include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00
sparcspkr.c of: Remove duplicate fields from of_platform_driver 2010-05-22 00:10:40 -06:00
twl4030-pwrbutton.c Input: twl4030-pwrbutton - switch to using threaded IRQ 2009-12-29 23:20:49 -08:00
twl4030-vibra.c include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00
uinput.c Input: uinput - mark as non-seekable 2010-02-04 00:31:10 -08:00
winbond-cir.c include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00
wistron_btns.c Input: wistron_btns - switch to using kmemdup() 2010-05-19 10:14:38 -07:00
wm831x-on.c include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00
yealink.c USB: rename usb_buffer_alloc() and usb_buffer_free() users 2010-05-20 13:21:38 -07:00
yealink.h tree-wide: Assorted spelling fixes 2010-02-09 11:13:56 +01:00