Commit 229aebb8 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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: (39 commits)
  Update broken web addresses in arch directory.
  Update broken web addresses in the kernel.
  Revert "drivers/usb: Remove unnecessary return's from void functions" for musb gadget
  Revert "Fix typo: configuation => configuration" partially
  ida: document IDA_BITMAP_LONGS calculation
  ext2: fix a typo on comment in ext2/inode.c
  drivers/scsi: Remove unnecessary casts of private_data
  drivers/s390: Remove unnecessary casts of private_data
  net/sunrpc/rpc_pipe.c: Remove unnecessary casts of private_data
  drivers/infiniband: Remove unnecessary casts of private_data
  drivers/gpu/drm: Remove unnecessary casts of private_data
  kernel/pm_qos_params.c: Remove unnecessary casts of private_data
  fs/ecryptfs: Remove unnecessary casts of private_data
  fs/seq_file.c: Remove unnecessary casts of private_data
  arm: uengine.c: remove C99 comments
  arm: scoop.c: remove C99 comments
  Fix typo configue => configure in comments
  Fix typo: configuation => configuration
  Fix typo interrest[ing|ed] => interest[ing|ed]
  Fix various typos of valid in comments
  ...

Fix up trivial conflicts in:
	drivers/char/ipmi/ipmi_si_intf.c
	drivers/usb/gadget/rndis.c
	net/irda/irnet/irnet_ppp.c
parents 8de547e1 50a23e6e

Documentation/arm/SA1100/FreeBird

+2 −2
Original line number Diff line number Diff line 
Freebird-1.1 is produced by Legned(C) ,Inc.

Freebird-1.1 is produced by Legend(C), Inc.

http://web.archive.org/web/*/http://www.legend.com.cn

and software/linux mainatined by Coventive(C),Inc.

and software/linux maintained by Coventive(C), Inc.

(http://www.coventive.com)



Based on the Nicolas's strongarm kernel tree.

Documentation/kernel-parameters.txt

+1 −1
Original line number Diff line number Diff line
@@ -1724,7 +1724,7 @@ and is between 256 and 4096 characters. It is defined in the file 
	norandmaps	Don't use address space randomization.  Equivalent to

			echo 0 > /proc/sys/kernel/randomize_va_space



	noreplace-paravirt	[X86-32,PV_OPS] Don't patch paravirt_ops

	noreplace-paravirt	[X86,IA-64,PV_OPS] Don't patch paravirt_ops



	noreplace-smp	[X86-32,SMP] Don't replace SMP instructions

			with UP alternatives

Documentation/vm/numa_memory_policy.txt

+1 −1
Original line number Diff line number Diff line
@@ -424,7 +424,7 @@ a command line tool, numactl(8), exists that allows one to: 


+ set the shared policy for a shared memory segment via mbind(2)



The numactl(8) tool is packages with the run-time version of the library

The numactl(8) tool is packaged with the run-time version of the library

containing the memory policy system call wrappers.  Some distributions

package the headers and compile-time libraries in a separate development

package.

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -3441,7 +3441,7 @@ F: scripts/package/ 


KERNEL JANITORS

L:	kernel-janitors@vger.kernel.org

W:	http://janitor.kernelnewbies.org/

W:	http://kernelnewbies.org/KernelJanitors

S:	Odd Fixes



KERNEL NFSD, SUNRPC, AND LOCKD SERVERS

arch/arm/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -1222,7 +1222,7 @@ config SMP 


	  See also <file:Documentation/i386/IO-APIC.txt>,

	  <file:Documentation/nmi_watchdog.txt> and the SMP-HOWTO available at

	  <http://www.linuxdoc.org/docs.html#howto>.

	  <http://tldp.org/HOWTO/SMP-HOWTO.html>.



	  If you don't know what to do here, say N.

CRA Git | Maintained and supported by SUSTech CRA and CCSE