Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
Linus Torvalds [Mon, 25 Oct 2010 14:59:01 +0000 (07:59 -0700)]
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: (75 commits)
  Input: wacom - specify Cinitq supported tools
  Input: ab8500-ponkey - fix IRQ freeing in error path
  Input: adp5588-keys - use more obvious i2c_device_id name string
  Input: ad7877 - switch to using threaded IRQ
  Input: ad7877 - use attribute group to control visibility of attributes
  Input: serio - add support for PS2Mult multiplexer protocol
  Input: wacom - properly enable runtime PM
  Input: ad7877 - filter events where pressure is beyond the maximum
  Input: ad7877 - implement EV_KEY:BTN_TOUCH reporting
  Input: ad7877 - implement specified chip select behavior
  Input: hp680_ts_input - use cancel_delayed_work_sync()
  Input: mousedev - correct lockdep annotation
  Input: ads7846 - switch to using threaded IRQ
  Input: serio - support multiple child devices per single parent
  Input: synaptics - simplify pass-through port handling
  Input: add ROHM BU21013 touch panel controller support
  Input: omap4-keypad - wake-up on events & long presses
  Input: omap4-keypad - fix interrupt line configuration
  Input: omap4-keypad - SYSCONFIG register configuration
  Input: omap4-keypad - use platform device helpers
  ...

16 files changed:
1  2 
arch/arm/mach-ux500/board-mop500.c
arch/arm/mach-ux500/devices-db8500.c
arch/arm/mach-ux500/include/mach/devices.h
arch/arm/mach-ux500/pins-db8500.h
drivers/char/sysrq.c
drivers/hid/hid-core.c
drivers/hid/hid-ids.h
drivers/hid/hid-input.c
drivers/input/evdev.c
drivers/input/input.c
drivers/input/keyboard/Kconfig
drivers/input/mousedev.c
drivers/media/IR/ir-keytable.c
drivers/staging/Kconfig
drivers/staging/Makefile
include/linux/input.h

Simple merge
Simple merge
@@@ -26,14 -26,8 +26,15 @@@ extern struct platform_device ux500_i2c
  extern struct platform_device u8500_i2c0_device;
  extern struct platform_device u8500_i2c4_device;
  extern struct platform_device u8500_dma40_device;
+ extern struct platform_device ux500_ske_keypad_device;
  
 +extern struct amba_device u8500_sdi0_device;
 +extern struct amba_device u8500_sdi1_device;
 +extern struct amba_device u8500_sdi2_device;
 +extern struct amba_device u8500_sdi3_device;
 +extern struct amba_device u8500_sdi4_device;
 +extern struct amba_device u8500_sdi5_device;
 +
  void dma40_u8500ed_fixup(void);
  
  #endif
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge