Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7d1fc01a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial 

Pull trivial tree updates from Jiri Kosina.

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial:
  floppy: make local variable non-static
  exynos: fixes an incorrect header guard
  dt-bindings: fixes some incorrect header guards
  cpufreq-dt: correct dead link in documentation
  cpufreq: ARM big LITTLE: correct dead link in documentation
  treewide: Fix typos in printk
  Documentation: filesystem: Fix typo in fs/eventfd.c
  fs/super.c: use && instead of & for warn_on condition
  Documentation: fix sysfs-ptp
  lib: scatterlist: fix Kconfig description
parents 0f0836b7 bcf4299e

Documentation/ABI/testing/sysfs-ptp

+1 −1
Original line number Diff line number Diff line
@@ -74,7 +74,7 @@ Description: 
		assignment may be changed by two writing numbers into

		the file.



What:		/sys/class/ptp/ptpN/pps_avaiable

What:		/sys/class/ptp/ptpN/pps_available

Date:		September 2010

Contact:	Richard Cochran <richardcochran@gmail.com>

Description:

Documentation/devicetree/bindings/cpufreq/arm_big_little_dt.txt

+1 −1
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ must be present contiguously. Generic DT driver will check only node 'x' for 
cpu:x.



Required properties:

- operating-points: Refer to Documentation/devicetree/bindings/power/opp.txt

- operating-points: Refer to Documentation/devicetree/bindings/opp/opp.txt

  for details



Optional properties:

Documentation/devicetree/bindings/cpufreq/cpufreq-dt.txt

+1 −1
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ Required properties: 
- None



Optional properties:

- operating-points: Refer to Documentation/devicetree/bindings/power/opp.txt for

- operating-points: Refer to Documentation/devicetree/bindings/opp/opp.txt for

  details. OPPs *must* be supplied either via DT, i.e. this property, or

  populated at runtime.

- clock-latency: Specify the possible maximum transition latency for clock,

Documentation/sysctl/vm.txt

+2 −2
Original line number Diff line number Diff line
@@ -135,7 +135,7 @@ Contains, as a percentage of total available memory that contains free pages 
and reclaimable pages, the number of pages at which the background kernel

flusher threads will start writing out dirty data.



The total avaiable memory is not equal to total system memory.

The total available memory is not equal to total system memory.



==============================================================
@@ -170,7 +170,7 @@ Contains, as a percentage of total available memory that contains free pages 
and reclaimable pages, the number of pages at which a process which is

generating disk writes will itself start writing out dirty data.



The total avaiable memory is not equal to total system memory.

The total available memory is not equal to total system memory.



==============================================================

drivers/block/floppy.c

+3 −2
Original line number Diff line number Diff line
@@ -3585,7 +3585,7 @@ static void __init config_types(void) 
		unsigned int type = UDP->cmos;

		struct floppy_drive_params *params;

		const char *name = NULL;

		static char temparea[32];

		char temparea[32];



		if (type < ARRAY_SIZE(default_drive_params)) {

			params = &default_drive_params[type].params;
@@ -3596,7 +3596,8 @@ static void __init config_types(void) 
				allowed_drive_mask &= ~(1 << drive);

		} else {

			params = &default_drive_params[0].params;

			sprintf(temparea, "unknown type %d (usb?)", type);

			snprintf(temparea, sizeof(temparea),

				 "unknown type %d (usb?)", type);

			name = temparea;

		}

		if (name) {