OpenCloudOS-Kernel/drivers/net/irda
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
..
Kconfig net/irda: Add SuperH IrDA driver support 2010-04-06 19:50:21 -07:00
Makefile net/irda: Add SuperH IrDA driver support 2010-04-06 19:50:21 -07:00
act200l-sir.c drivers/net/*/: Use static const 2010-12-21 02:16:10 -08:00
actisys-sir.c
ali-ircc.c Fix typo: configuation => configuration 2010-09-23 11:46:48 +02:00
ali-ircc.h
au1k_ir.c net: trans_start cleanups 2010-05-10 05:01:31 -07:00
au1000_ircc.h
bfin_sir.c net/irda: bfin_sir: IRDA is not affected by anomaly 05000230 2010-05-23 23:57:45 -07:00
bfin_sir.h net/irda: bfin_sir: back out transitional defines 2011-01-10 07:18:03 -05:00
donauboe.c drivers/net/*/: Use static const 2010-12-21 02:16:10 -08:00
donauboe.h tree-wide: fix comment/printk typos 2010-11-01 15:38:34 -04:00
ep7211-sir.c
esi-sir.c
girbil-sir.c
irda-usb.c irda: Test index before read in stir421x_patch_device() 2010-10-11 02:11:58 +02:00
irda-usb.h drivers/net: use __packed annotation 2010-06-03 03:18:23 -07:00
irtty-sir.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
irtty-sir.h
kingsun-sir.c headers: kref.h redux 2009-09-26 10:17:19 -07:00
ks959-sir.c drivers/net: use __packed annotation 2010-06-03 03:18:23 -07:00
ksdazzle-sir.c drivers/net: use __packed annotation 2010-06-03 03:18:23 -07:00
litelink-sir.c
ma600-sir.c
mcp2120-sir.c
mcs7780.c drivers/net: don't use flush_scheduled_work() 2010-12-12 16:45:14 +01:00
mcs7780.h
nsc-ircc.c drivers/net: return operator cleanup 2010-09-26 18:34:29 -07:00
nsc-ircc.h
old_belkin-sir.c
pxaficp_ir.c net: trans_start cleanups 2010-05-10 05:01:31 -07:00
sa1100_ir.c net: trans_start cleanups 2010-05-10 05:01:31 -07:00
sh_irda.c Merge master.kernel.org:/pub/scm/linux/kernel/git/lethal/genesis-2.6 into devel-stable 2010-08-06 18:13:19 +01:00
sh_sir.c SuperH IrDA: correct Baud rate error correction 2010-11-21 10:09:53 -08:00
sir-dev.h
sir_dev.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6 2010-10-23 11:47:02 -07:00
sir_dongle.c
smsc-ircc2.c smsc-ircc2: Fix section mismatch derived from smsc_ircc_pnp_probe() 2011-01-03 13:27:38 -08:00
smsc-ircc2.h
smsc-sio.h
stir4200.c drivers/net: return operator cleanup 2010-09-26 18:34:29 -07:00
tekram-sir.c
toim3232-sir.c headers: remove sched.h from interrupt.h 2009-10-11 11:20:58 -07:00
via-ircc.c drivers/net/irda: Eliminate memory leak 2010-08-25 16:36:49 -07:00
via-ircc.h drivers/net: return operator cleanup 2010-09-26 18:34:29 -07:00
vlsi_ir.c net: trans_start cleanups 2010-05-10 05:01:31 -07:00
vlsi_ir.h drivers/net: return operator cleanup 2010-09-26 18:34:29 -07:00
w83977af.h
w83977af_ir.c net: trans_start cleanups 2010-05-10 05:01:31 -07:00
w83977af_ir.h