openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity
linux/drivers/misc
History
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
..
c2port sysfs: add struct file* to bin_attr callbacks 2010-05-21 09:37:31 -07:00
cb710 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
eeprom misc/at24: add more sanity checks for parameters 2010-12-24 02:14:17 -07:00
ibmasm convert get_sb_single() users 2010-10-29 04:16:28 -04:00
iwmc3200top net/wireless: use generic_file_llseek in debugfs 2010-09-16 10:33:08 +02:00
sgi-gru llseek: automatically add .llseek fop 2010-10-15 15:53:27 +02:00
sgi-xp sgi-xpc: XPC fails to discover partitions with all nasids above 128 2010-11-25 06:50:40 +09:00
ti-st drivers: misc: ti-st: fix review comments 2010-10-14 12:41:10 -07:00
Kconfig spelling fix in drivers/misc/Kconfig 2010-11-15 13:52:17 +01:00
Makefile misc: Add ab8500 pwm driver 2010-10-29 00:29:21 +02:00
ab8500-pwm.c misc: Add ab8500 pwm driver 2010-10-29 00:29:21 +02:00
ad525x_dpot-i2c.c drivers/misc/ad525x_dpot.c: new features 2010-10-26 16:52:14 -07:00
ad525x_dpot-spi.c drivers/misc/ad525x_dpot.c: new features 2010-10-26 16:52:14 -07:00
ad525x_dpot.c drivers/misc/ad525x_dpot.c: new features 2010-10-26 16:52:14 -07:00
ad525x_dpot.h ad525x_dpot: use correct rdac channel for ad5251/ad5252 2010-10-26 16:52:14 -07:00
apds990x.c drivers/misc: driver for APDS990X ALS and proximity sensors 2010-10-26 16:52:14 -07:00
apds9802als.c i2c: Remove obsolete cleanup for clientdata 2010-11-15 22:40:38 +01:00
arm-charlcd.c tree-wide: fix comment/printk typos 2010-11-01 15:38:34 -04:00
atmel-ssc.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
atmel_pwm.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
atmel_tclib.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
bh1770glc.c drivers/misc/bh1770glc.c: error handling in bh1770_power_state_store() 2010-11-12 07:55:31 -08:00
bh1780gli.c i2c: Remove obsolete cleanup for clientdata 2010-09-30 14:14:22 +02:00
bmp085.c drivers/misc: support for the pressure sensor BMP085 from Bosch Sensortec 2010-08-09 20:45:05 -07:00
cs5535-mfgpt.c cs5535-mfgpt: reuse timers that have never been set up 2010-08-11 08:59:20 -07:00
ds1682.c sysfs: add struct file* to bin_attr callbacks 2010-05-21 09:37:31 -07:00
enclosure.c [SCSI] enclosure: fix error path - actually return ERR_PTR() on error 2010-07-27 12:03:48 -05:00
ep93xx_pwm.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
hmc6352.c hmc6352: add driver for the HMC6352 compass 2010-08-09 20:45:10 -07:00
hpilo.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6 2010-10-22 19:36:42 -07:00
hpilo.h hpilo: fix pointer warning in ilo_ccb_setup 2010-08-09 20:45:05 -07:00
ics932s401.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
ioc4.c ioc4: use static work_struct for ioc4_load_modules() 2010-12-24 16:14:20 +01:00
isl29003.c isl29003: fix resume functionality 2009-05-06 16:36:10 -07:00
isl29020.c drivers/misc/isl29020.c: remove incorrect kfree in isl29020_remove() 2010-11-25 06:50:47 +09:00
kgdbts.c kgdbts: prevent re-entry to kgdbts before it unregisters 2010-10-29 13:14:41 -05:00
lkdtm.c lkdtm: prefix enum constants 2010-10-26 16:52:14 -07:00
pch_phub.c pch_phub: fix build warnings 2010-10-22 10:16:42 -07:00
phantom.c drivers/misc/phantom.c: add missing warning messages in phantom_probe() 2010-10-26 16:52:14 -07:00
ti_dac7512.c drivers/misc: add driver for Texas Instruments DAC7512 2009-12-15 08:53:25 -08:00
tifm_7xx1.c dma-mapping: replace all DMA_32BIT_MASK macro with DMA_BIT_MASK(32) 2009-04-07 08:31:11 -07:00
tifm_core.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
tsl2550.c tsl2550: Move from i2c/chips to misc 2010-03-13 20:56:54 +01:00
vmw_balloon.c VMware balloon: stop locking pages when hypervisor tells us enough 2011-01-13 08:03:22 -08:00