2
0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-29 23:53:55 +08:00
linux-next/drivers/isdn/gigaset
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
..
asyncdata.c isdn/gigaset: honor CAPI application's buffer size request 2010-06-25 21:16:59 -07:00
bas-gigaset.c tree-wide: fix comment/printk typos 2010-11-01 15:38:34 -04:00
capi.c ISDN, Gigaset: Fix memory leak in do_disconnect_req() 2010-12-31 11:17:10 -08:00
common.c isdn/gigaset: drop obsolete debug option 2010-10-01 00:33:34 -07:00
dummyll.c gigaset: fix build failure 2010-03-17 14:22:07 -07:00
ev-layer.c drivers: isdn: get rid of custom strtoul() 2010-07-15 19:05:25 -07:00
gigaset.h isdn/gigaset: drop obsolete debug option 2010-10-01 00:33:34 -07:00
i4l.c isdn/gigaset: drop obsolete debug option 2010-10-01 00:33:34 -07:00
interface.c isdn/gigaset: remove obsolete compile time options 2010-07-07 16:57:54 -07:00
isocdata.c isdn/gigaset: correct bas_gigaset rx buffer handling 2010-10-01 00:33:33 -07:00
Kconfig isdn/gigaset: remove EXPERIMENTAL tag from GIGASET_CAPI 2010-07-07 16:57:56 -07:00
Makefile gigaset: add Kernel CAPI interface (v3) 2009-10-06 22:43:53 -07:00
proc.c gigaset: include cleanup cleanup 2010-04-18 02:33:29 -07:00
ser-gigaset.c tree-wide: fix comment/printk typos 2010-11-01 15:38:34 -04:00
usb-gigaset.c tree-wide: fix comment/printk typos 2010-11-01 15:38:34 -04:00