linux/drivers/input/misc
Linus Torvalds 229aebb873 Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
* 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (39 commits)
  Update broken web addresses in arch directory.
  Update broken web addresses in the kernel.
  Revert "drivers/usb: Remove unnecessary return's from void functions" for musb gadget
  Revert "Fix typo: configuation => configuration" partially
  ida: document IDA_BITMAP_LONGS calculation
  ext2: fix a typo on comment in ext2/inode.c
  drivers/scsi: Remove unnecessary casts of private_data
  drivers/s390: Remove unnecessary casts of private_data
  net/sunrpc/rpc_pipe.c: Remove unnecessary casts of private_data
  drivers/infiniband: Remove unnecessary casts of private_data
  drivers/gpu/drm: Remove unnecessary casts of private_data
  kernel/pm_qos_params.c: Remove unnecessary casts of private_data
  fs/ecryptfs: Remove unnecessary casts of private_data
  fs/seq_file.c: Remove unnecessary casts of private_data
  arm: uengine.c: remove C99 comments
  arm: scoop.c: remove C99 comments
  Fix typo configue => configure in comments
  Fix typo: configuation => configuration
  Fix typo interrest[ing|ed] => interest[ing|ed]
  Fix various typos of valid in comments
  ...

Fix up trivial conflicts in:
	drivers/char/ipmi/ipmi_si_intf.c
	drivers/usb/gadget/rndis.c
	net/irda/irnet/irnet_ppp.c
2010-10-24 13:41:39 -07:00
..
88pm860x_onkey.c
ad714x-i2c.c i2c: Remove all i2c_set_clientdata(client, NULL) in drivers 2010-06-03 11:33:58 +02:00
ad714x-spi.c
ad714x.c fix typos concerning "initiali[zs]e" 2010-06-16 18:05:05 +02:00
ad714x.h
adxl34x-i2c.c Input: adxl34 - make enable/disable separate from suspend/resume 2010-07-03 13:13:21 -07:00
adxl34x-spi.c Input: adxl34 - make enable/disable separate from suspend/resume 2010-07-03 13:13:21 -07:00
adxl34x.c Input: adxl34x - do not mark device as disabled on startup 2010-08-05 10:07:31 -07:00
adxl34x.h Input: adxl34 - make enable/disable separate from suspend/resume 2010-07-03 13:13:21 -07:00
apanel.c
ati_remote2.c param: use ops in struct kernel_param, rather than get and set fns directly 2010-08-11 23:04:13 +09:30
ati_remote.c
atlas_btns.c Input: atlas_btns - switch to using pr_err() and friends 2010-07-13 09:43:24 -07:00
bfin_rotary.c
cm109.c Update broken web addresses in the kernel. 2010-10-18 11:03:14 +02: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 ixp4xx-beeper: Use IRQF_NO_SUSPEND not IRQF_TIMER for non-timer interrupt 2010-07-29 13:24:57 +02:00
Kconfig Input: Add pwm beeper driver 2010-07-14 01:23:11 -07:00
keyspan_remote.c
m68kspkr.c
Makefile Input: Add pwm beeper driver 2010-07-14 01:23:11 -07:00
max8925_onkey.c Input: enable onkey driver of max8925 2010-05-22 00:57:59 -07:00
pcap_keys.c
pcf8574_keypad.c Merge commit 'v2.6.35-rc3' into for-linus 2010-06-22 11:32:04 -07:00
pcf50633-input.c
pcspkr.c
powermate.c
pwm-beeper.c Input: Add pwm beeper driver 2010-07-14 01:23:11 -07:00
rb532_button.c
rotary_encoder.c
sgi_btns.c
sparcspkr.c of/device: Replace struct of_device with struct platform_device 2010-08-06 09:25:50 -06:00
twl4030-pwrbutton.c Input: twl4030-pwrbutton - replace __devinit with __init 2010-07-08 21:02:55 -07:00
twl4030-vibra.c Input: twl4030-vibra - correct the power down sequence 2010-05-22 00:58:06 -07:00
uinput.c Merge branch 'llseek' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/bkl 2010-10-22 10:52:56 -07:00
winbond-cir.c
wistron_btns.c Input: wistron_btns - fix a memory leak in wb_module_init error path 2010-06-28 01:12:22 -07:00
wm831x-on.c
yealink.c
yealink.h