1
0
Fork 0
alistair23-linux/drivers/isdn/hardware/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 isdn: fix netjet/isdnhdlc build errors 2009-09-28 12:47:36 -07:00
Makefile mISDN: Add support for Traverse Technologies NETJet PCI cards 2009-07-25 20:22:36 +02:00
avmfritz.c fix comment/printk typos concerning "already" 2010-07-11 21:45:40 +02:00
hfc_multi.h mISDN: Add XHFC support for embedded Speech-Design board to hfcmulti 2009-05-25 00:55:30 -07:00
hfc_multi_8xx.h mISDN: Add XHFC support for embedded Speech-Design board to hfcmulti 2009-05-25 00:55:30 -07:00
hfc_pci.h mISDN: Add different different timer settings for hfc-pci 2009-01-09 22:44:28 +01:00
hfcmulti.c Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial 2010-08-04 15:31:02 -07:00
hfcpci.c Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial 2010-08-04 15:31:02 -07:00
hfcsusb.c drivers/isdn/hardware/mISDN: Add missing spin_unlock 2010-05-29 00:18:48 -07:00
hfcsusb.h tree-wide: fix assorted typos all over the place 2009-12-04 15:39:55 +01:00
iohelper.h mISDN: Fix wrong struct name in macro and clarifications 2009-07-27 08:20:55 -07:00
ipac.h tree-wide: fix comment/printk typos 2010-11-01 15:38:34 -04:00
isar.h tree-wide: fix comment/printk typos 2010-11-01 15:38:34 -04:00
mISDNinfineon.c drivers/isdn: Remove unnecessary semicolons 2010-11-15 11:06:17 -08:00
mISDNipac.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
mISDNisar.c drivers/isdn: Remove unnecessary semicolons 2010-11-15 11:06:17 -08:00
netjet.c drivers/isdn/hardware/mISDN: Use GFP_ATOMIC when a lock is held 2010-06-01 00:26:06 -07:00
netjet.h mISDN: Add support for Traverse Technologies NETJet PCI cards 2009-07-25 20:22:36 +02:00
speedfax.c fix comment/printk typos concerning "already" 2010-07-11 21:45:40 +02:00
w6692.c fix comment/printk typos concerning "already" 2010-07-11 21:45:40 +02:00
w6692.h mISDN: Add driver for Winbond cards 2009-07-25 20:21:28 +02:00