linux_dsm_epyc7002/drivers/input/serio
Linus Torvalds 008d23e485 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: (43 commits)
  Documentation/trace/events.txt: Remove obsolete sched_signal_send.
  writeback: fix global_dirty_limits comment runtime -> real-time
  ppc: fix comment typo singal -> signal
  drivers: fix comment typo diable -> disable.
  m68k: fix comment typo diable -> disable.
  wireless: comment typo fix diable -> disable.
  media: comment typo fix diable -> disable.
  remove doc for obsolete dynamic-printk kernel-parameter
  remove extraneous 'is' from Documentation/iostats.txt
  Fix spelling milisec -> ms in snd_ps3 module parameter description
  Fix spelling mistakes in comments
  Revert conflicting V4L changes
  i7core_edac: fix typos in comments
  mm/rmap.c: fix comment
  sound, ca0106: Fix assignment to 'channel'.
  hrtimer: fix a typo in comment
  init/Kconfig: fix typo
  anon_inodes: fix wrong function name in comment
  fix comment typos concerning "consistent"
  poll: fix a typo in comment
  ...

Fix up trivial conflicts in:
 - drivers/net/wireless/iwlwifi/iwl-core.c (moved to iwl-legacy.c)
 - fs/ext4/ext4.h

Also fix missed 'diabled' typo in drivers/net/bnx2x/bnx2x.h while at it.
2011-01-13 10:05:56 -08:00
..
altera_ps2.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
ambakmi.c Input: ambakmi - annotate probe() and remove() methods 2009-12-11 23:45:57 -08:00
ams_delta_serio.c Input: ams_delta_serio - fix wrong kfree in ams_delta_serio_exit 2010-11-21 22:32:13 -08:00
at32psif.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
ct82c710.c Input: ct82c710 - remove a redundant serio_register_port() 2010-11-21 22:32:17 -08:00
gscps2.c parisc: Fix GSC PS/2 driver name for keyboard and mouse 2010-12-04 11:19:59 -05:00
hil_mlc.c Input: serio HIL MLC - don't deref null, don't leak and return proper error 2010-11-20 13:38:18 -08:00
hp_sdc_mlc.c Input: serio HIL MLC - don't deref null, don't leak and return proper error 2010-11-20 13:38:18 -08:00
hp_sdc.c input: Serio/hp_sdc: semaphore cleanup 2010-10-12 17:36:08 +02:00
i8042-io.h powerpc: Add i8042 keyboard and mouse irq parsing 2010-07-09 11:28:33 +10:00
i8042-ip22io.h Input: make i8042_platform_init return 'real' error code 2005-09-04 01:41:38 -05:00
i8042-jazzio.h Input: make i8042_platform_init return 'real' error code 2005-09-04 01:41:38 -05:00
i8042-ppcio.h Input: i8042 - remove SPRUCE support 2010-06-04 00:44:30 -07:00
i8042-snirm.h Input: i8042 - add SNI RM support 2008-03-14 11:54:06 -04:00
i8042-sparcio.h of/device: Replace struct of_device with struct platform_device 2010-08-06 09:25:50 -06:00
i8042-x86ia64io.h Input: i8042 - introduce 'notimeout' blacklist for Dell Vostro V13 2011-01-08 01:38:11 -08:00
i8042.c Input: i8042 - introduce 'notimeout' blacklist for Dell Vostro V13 2011-01-08 01:38:11 -08:00
i8042.h Input: i8042 - use pr_<level>, pr_fmt, fix dbg and __FILE__ use 2010-11-30 23:10:20 -08:00
Kconfig Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial 2011-01-13 10:05:56 -08:00
libps2.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
maceps2.c define global BIT macro 2007-10-19 11:53:42 -07:00
Makefile Input: serio - add support for PS2Mult multiplexer protocol 2010-10-18 09:33:31 -07:00
parkbd.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
pcips2.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
ps2mult.c Input: ps2mult - fix wrong kfree in ps2mult_connect error path 2010-11-21 22:32:09 -08:00
q40kbd.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
rpckbd.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
sa1111ps2.c Input: sa1111ps2 - annotate probe() and remove() methods 2009-12-11 23:46:05 -08:00
serio_raw.c BKL: remove extraneous #include <smp_lock.h> 2010-11-17 08:59:32 -08:00
serio.c Input: serio - convert to common workqueue instead of a thread 2010-11-18 00:25:45 -08:00
serport.c serport: place serport serio device correctly in the device tree 2010-10-22 10:19:58 -07:00
xilinx_ps2.c of/device: Replace struct of_device with struct platform_device 2010-08-06 09:25:50 -06:00