Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 519f0141 authored Jul 21, 2008 by Linus Torvalds

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

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: (48 commits)
  Input: add switch for dock events
  Input: add microphone insert switch definition
  Input: i8042 - add Arima-Rioworks HDAMB board to noloop list
  Input: sgi_btns - add support for SGI Indy volume buttons
  Input: add option to disable HP SDC driver
  Input: serio - trivial documentation fix
  Input: add new serio driver for Xilinx XPS PS2 IP
  Input: add driver for Tabletkiosk Sahara TouchIT-213 touchscreen
  Input: new driver for SGI O2 volume buttons
  Input: yealink - reliably kill urbs
  Input: q40kbd - make q40kbd_lock static
  Input: gtco - eliminate early return
  Input: i8042 - add Dritek quirk for Acer Aspire 5720
  Input: usbtouchscreen - ignore eGalax screens supporting HID protocol
  Input: i8042 - add Medion NAM 2070 to noloop blacklist
  Input: i8042 - add Gericom Bellagio to nomux blacklist
  Input: i8042 - add Acer Aspire 1360 to nomux blacklist
  Input: hp_sdc_mlc.c - make a struct static
  Input: hil_mlc.c - make code static
  Input: wistron - generate normal key event if bluetooth or wifi not present
  ...

parents f8b71a3a 908cf4b9

Documentation/input/gameport-programming.txt

+0 −2

Original line number	Original line	Diff line number	Diff line
	$Id: gameport-programming.txt,v 1.3 2001/04/24 13:51:37 vojtech Exp $

	Programming gameport drivers		Programming gameport drivers
	~~~~~~~~~~~~~~~~~~~~~~~~~~~~		~~~~~~~~~~~~~~~~~~~~~~~~~~~~

Documentation/input/input.txt

+0 −1

Original line number	Original line	Diff line number	Diff line
	Linux Input drivers v1.0		Linux Input drivers v1.0
	(c) 1999-2001 Vojtech Pavlik <vojtech@ucw.cz>		(c) 1999-2001 Vojtech Pavlik <vojtech@ucw.cz>
	Sponsored by SuSE		Sponsored by SuSE
	$Id: input.txt,v 1.8 2002/05/29 03:15:01 bradleym Exp $
	----------------------------------------------------------------------------		----------------------------------------------------------------------------

	0. Disclaimer		0. Disclaimer

Documentation/input/joystick-api.txt

+0 −2

Original line number	Original line	Diff line number	Diff line
	@@ -5,8 +5,6 @@

	7 Aug 1998		7 Aug 1998

	$Id: joystick-api.txt,v 1.2 2001/05/08 21:21:23 vojtech Exp $

	1. Initialization		1. Initialization
	~~~~~~~~~~~~~~~~~		~~~~~~~~~~~~~~~~~

Documentation/input/joystick-parport.txt

+0 −1

Original line number	Original line	Diff line number	Diff line
	@@ -2,7 +2,6 @@
	(c) 1998-2000 Vojtech Pavlik <vojtech@ucw.cz>		(c) 1998-2000 Vojtech Pavlik <vojtech@ucw.cz>
	(c) 1998 Andree Borrmann <a.borrmann@tu-bs.de>		(c) 1998 Andree Borrmann <a.borrmann@tu-bs.de>
	Sponsored by SuSE		Sponsored by SuSE
	$Id: joystick-parport.txt,v 1.6 2001/09/25 09:31:32 vojtech Exp $
	----------------------------------------------------------------------------		----------------------------------------------------------------------------

	0. Disclaimer		0. Disclaimer

Documentation/input/joystick.txt

+0 −1

Original line number	Original line	Diff line number	Diff line
	Linux Joystick driver v2.0.0		Linux Joystick driver v2.0.0
	(c) 1996-2000 Vojtech Pavlik <vojtech@ucw.cz>		(c) 1996-2000 Vojtech Pavlik <vojtech@ucw.cz>
	Sponsored by SuSE		Sponsored by SuSE
	$Id: joystick.txt,v 1.12 2002/03/03 12:13:07 jdeneux Exp $
	----------------------------------------------------------------------------		----------------------------------------------------------------------------

	0. Disclaimer		0. Disclaimer