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.

1 files changed, 5 insertions, 5 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index 5a9d67aec0e7..78162c4f9544 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2007,7 +2007,7 @@ F:	drivers/scsi/dc395x.*
 DCCP PROTOCOL
 M:      Arnaldo Carvalho de Melo <acme@ghostprotocols.net>
 L:      dccp@vger.kernel.org
-W:      http://linux-net.osdl.org/index.php/DCCP
+W:      http://www.linuxfoundation.org/collaborate/workgroups/networking/dccp
 S:      Maintained
 F:      include/linux/dccp.h
 F:      include/linux/tfrc.h
@@ -2429,7 +2429,7 @@ ETHERNET BRIDGE
 M:      Stephen Hemminger <shemminger@linux-foundation.org>
 L:      bridge@lists.linux-foundation.org
 L:      netdev@vger.kernel.org
-W:      http://www.linux-foundation.org/en/Net:Bridge
+W:      http://www.linuxfoundation.org/en/Net:Bridge
 S:      Maintained
 F:      include/linux/netfilter_bridge/
 F:      net/bridge/
@@ -4633,7 +4633,7 @@ M:	Jeremy Fitzhardinge <jeremy@xensource.com>
 M:      Chris Wright <chrisw@sous-sol.org>
 M:      Alok Kataria <akataria@vmware.com>
 M:      Rusty Russell <rusty@rustcorp.com.au>
-L:      virtualization@lists.osdl.org
+L:      virtualization@lists.linux-foundation.org
 S:      Supported
 F:      Documentation/ia64/paravirt_ops.txt
 F:      arch/*/kernel/paravirt*
@@ -6530,7 +6530,7 @@ F:	include/linux/virtio_console.h
 VIRTIO HOST (VHOST)
 M:      "Michael S. Tsirkin" <mst@redhat.com>
 L:      kvm@vger.kernel.org
-L:      virtualization@lists.osdl.org
+L:      virtualization@lists.linux-foundation.org
 L:      netdev@vger.kernel.org
 S:      Maintained
 F:      drivers/vhost/
@@ -6800,7 +6800,7 @@ XEN HYPERVISOR INTERFACE
 M:      Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
 M:      Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
 L:      xen-devel@lists.xensource.com (moderated for non-subscribers)
-L:      virtualization@lists.osdl.org
+L:      virtualization@lists.linux-foundation.org
 S:      Supported
 F:      arch/x86/xen/
 F:      drivers/*/xen-*front.c