github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-06-20 13:09:07 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph
2aa13531bb
linux/drivers/input/misc
History
Linus Torvalds a0a4194c94 Merge branch 'for-next' of git://git.infradead.org/users/sameo/mfd-2.6 
* 'for-next' of git://git.infradead.org/users/sameo/mfd-2.6: (80 commits)
  mfd: Fix missing abx500 header file updates
  mfd: Add missing <linux/io.h> include to intel_msic
  x86, mrst: add platform support for MSIC MFD driver
  mfd: Expose TurnOnStatus in ab8500 sysfs
  mfd: Remove support for early drop ab8500 chip
  mfd: Add support for ab8500 v3.3
  mfd: Add ab8500 interrupt disable hook
  mfd: Convert db8500-prcmu panic() into pr_crit()
  mfd: Refactor db8500-prcmu request_clock() function
  mfd: Rename db8500-prcmu init function
  mfd: Fix db5500-prcmu defines
  mfd: db8500-prcmu voltage domain consumers additions
  mfd: db8500-prcmu reset code retrieval
  mfd: db8500-prcmu tweak for modem wakeup
  mfd: Add db8500-pcmu watchdog accessor functions for watchdog
  mfd: hwacc power state db8500-prcmu accessor
  mfd: Add db8500-prcmu accessors for PLL and SGA clock
  mfd: Move to the new db500 PRCMU API
  mfd: Create a common interface for dbx500 PRCMU drivers
  mfd: Initialize DB8500 PRCMU regs
  ...

Fix up trivial conflicts in
	arch/arm/mach-imx/mach-mx31moboard.c
	arch/arm/mach-omap2/board-omap3beagle.c
	arch/arm/mach-u300/include/mach/irqs.h
	drivers/mfd/wm831x-spi.c
2011-11-03 09:40:51 -07:00
..
88pm860x_onkey.c mfd: Adopt mfd_data in 88pm860x input driver 2011-03-23 10:42:06 +01:00
ab8500-ponkey.c Input: ab8500-ponkey - fix IRQ freeing in error path 2010-10-24 21:56:17 -07:00
ad714x-i2c.c Merge commit 'v3.1-rc4' into next 2011-09-07 14:18:36 -07:00
ad714x-spi.c Input: ad714x - read the interrupt status registers in a row 2011-08-22 09:59:26 -07:00
ad714x.c Input: ad714x - read the interrupt status registers in a row 2011-08-22 09:59:26 -07:00
ad714x.h Input: ad714x - read the interrupt status registers in a row 2011-08-22 09:59:26 -07:00
adxl34x-i2c.c Input: adxl34x-i2c - convert to dev_pm_ops 2011-02-21 01:02:31 -08:00
adxl34x-spi.c Input: adxl34x - fix references to adx134x 2011-02-21 01:02:32 -08:00
adxl34x.c Fix common misspellings 2011-03-31 11:26:23 -03:00
adxl34x.h
apanel.c
ati_remote2.c Input: ati_remote2 - return the error code from sysfs channel_mask store 2011-05-05 08:49:38 -07:00
atlas_btns.c
bfin_rotary.c Input: remove unneeded version.h includes 2011-06-27 12:42:54 -07:00
bma150.c Input: add driver for Bosch Sensortec's BMA150 accelerometer 2011-08-09 01:33:04 -07:00
cm109.c Input: cm109 - fix checking return value of usb_control_msg 2011-08-26 23:20:30 -07:00
cma3000_d0x_i2c.c Input: cma3000_d0x_i2c - add MODULE_DEVICE_TABLE 2010-12-07 22:13:40 -08:00
cma3000_d0x.c Input: add CMA3000 accelerometer driver 2010-11-30 23:05:21 -08:00
cma3000_d0x.h Input: add CMA3000 accelerometer driver 2010-11-30 23:05:21 -08:00
cobalt_btns.c
dm355evm_keys.c
hp_sdc_rtc.c Merge branch 'trivial' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/bkl 2010-10-22 10:49:54 -07:00
ixp4xx-beeper.c Input: remove IRQF_DISABLED from drivers 2011-09-07 14:19:11 -07:00
Kconfig Merge branch 'for-next' of git://git.infradead.org/users/sameo/mfd-2.6 2011-11-03 09:40:51 -07:00
keyspan_remote.c Fix common misspellings 2011-03-31 11:26:23 -03:00
kxtj9.c Input: kxtj9 - explicitly include module.h 2011-07-30 12:03:32 -07:00
m68kspkr.c
Makefile Merge branch 'for-next' of git://git.infradead.org/users/sameo/mfd-2.6 2011-11-03 09:40:51 -07:00
max8925_onkey.c input: Monitor both onkey up and down event 2010-10-29 00:29:46 +02:00
mc13783-pwrbutton.c input: Add power button support for mc13783 2011-10-24 14:09:14 +02:00
mma8450.c Input: mma8450 - silence some 'uninitialized variable' warnings 2011-10-06 19:41:57 -07:00
mpu3050.c Input: mpu3050 - correct call to input_free_device 2011-08-11 09:22:40 -07:00
pcap_keys.c
pcf8574_keypad.c Input: pcf_keypad - convert to dev_op_ops 2010-11-11 22:02:57 -08:00
pcf50633-input.c
pcspkr.c i8253: Make pcspkr input driver use the shared i8253_lock 2011-06-09 15:01:38 +02:00
pm8xxx-vibrator.c Input: add support for pm8xxx based vibrator driver 2011-08-02 22:21:17 -07:00
pmic8xxx-pwrkey.c input: pmic8xxx-pwrkey: Do not use mfd_get_data() 2011-07-05 10:38:43 +02:00
powermate.c Input: return -ENOMEM in select drivers when memory allocation fails 2010-10-13 07:49:23 -07:00
pwm-beeper.c Input: Add pwm beeper driver 2010-07-14 01:23:11 -07:00
rb532_button.c
rotary_encoder.c doc: fix broken references 2011-09-27 18:08:04 +02:00
sgi_btns.c
sparcspkr.c dt/sparc: Eliminate users of of_platform_{,un}register_driver 2011-02-28 01:36:39 -07:00
twl4030-pwrbutton.c Input: twl4030-pwrbutton - fix a leak of the IRQ during init failure 2011-04-27 23:11:33 -07:00
twl4030-vibra.c MFD: twl4030-audio: Rename platform data 2011-07-04 18:44:02 +03:00
twl6040-vibra.c Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound 2011-10-28 14:25:01 -07:00
uinput.c Input: uinput - allow for 0/0 min/max on absolute axes. 2011-03-31 00:02:39 -07:00
wistron_btns.c Fix common misspellings 2011-03-31 11:26:23 -03:00
wm831x-on.c
xen-kbdfront.c Input: xen-kbdfront - enable driver for HVM guests 2011-07-04 19:31:19 -07:00
yealink.c
yealink.h