1
0
Fork 0
alistair23-linux/drivers/isdn/mISDN
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 trivial: fix typos/grammar errors in Kconfig texts 2009-03-30 15:22:01 +02:00
Makefile mISDN: Add ISDN sample clock API to mISDN core 2009-01-09 22:44:27 +01:00
clock.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
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
core.h mISDN: Add ISDN sample clock API to mISDN core 2009-01-09 22:44:27 +01:00
dsp.h mISDN: Fix DTMF detection enable/disable 2009-05-25 00:55:47 -07:00
dsp_audio.c mISDN: Cleanup debug messages 2009-05-25 00:55:45 -07:00
dsp_biquad.h Add mISDN DSP 2008-07-27 01:56:38 +02:00
dsp_blowfish.c Add mISDN DSP 2008-07-27 01:56:38 +02:00
dsp_cmx.c drivers: fix comment typo diable -> disable. 2011-01-03 16:08:59 +01:00
dsp_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
dsp_dtmf.c mISDN: Fix DTMF detection enable/disable 2009-05-25 00:55:47 -07:00
dsp_ecdis.h mISDN: Cleanup debug messages 2009-05-25 00:55:45 -07:00
dsp_hwec.c drivers/isdn/mISDN: use ARRAY_SIZE 2008-12-03 20:59:57 -08:00
dsp_hwec.h Add mISDN DSP 2008-07-27 01:56:38 +02:00
dsp_pipeline.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
dsp_tones.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
fsm.c
fsm.h
hwchannel.c mISDN: don't use flush_scheduled_work() 2010-12-24 15:59:07 +01:00
l1oip.h mISDN: Use kernel_{send,recv}msg instead of open coding 2009-05-25 00:55:46 -07:00
l1oip_codec.c mISDN: DSP now uses ring buffer for echo canceler 2009-05-25 00:51:30 -07:00
l1oip_core.c mISDN: don't use flush_scheduled_work() 2010-12-24 15:59:07 +01:00
layer1.c drivers/isdn/mISDN: Use printf extension %pV 2010-11-16 10:22:58 -08:00
layer1.h
layer2.c drivers/isdn/mISDN: Use printf extension %pV 2010-11-16 10:22:58 -08:00
layer2.h mISDN: Fix TEI and SAPI handling 2009-05-25 00:51:35 -07:00
socket.c isdn: mISDN: socket: fix information leak to userland 2010-10-30 16:49:38 -07:00
stack.c misdn: kill big kernel lock 2010-09-15 19:29:56 -07:00
tei.c drivers/isdn/mISDN: Use printf extension %pV 2010-11-16 10:22:58 -08:00
timerdev.c llseek: automatically add .llseek fop 2010-10-15 15:53:27 +02:00