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

Commit 98793265 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 

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (53 commits)
  Kconfig: acpi: Fix typo in comment.
  misc latin1 to utf8 conversions
  devres: Fix a typo in devm_kfree comment
  btrfs: free-space-cache.c: remove extra semicolon.
  fat: Spelling s/obsolate/obsolete/g
  SCSI, pmcraid: Fix spelling error in a pmcraid_err() call
  tools/power turbostat: update fields in manpage
  mac80211: drop spelling fix
  types.h: fix comment spelling for 'architectures'
  typo fixes: aera -> area, exntension -> extension
  devices.txt: Fix typo of 'VMware'.
  sis900: Fix enum typo 'sis900_rx_bufer_status'
  decompress_bunzip2: remove invalid vi modeline
  treewide: Fix comment and string typo 'bufer'
  hyper-v: Update MAINTAINERS
  treewide: Fix typos in various parts of the kernel, and fix some comments.
  clockevents: drop unknown Kconfig symbol GENERIC_CLOCKEVENTS_MIGR
  gpio: Kconfig: drop unknown symbol 'CS5535_GPIO'
  leds: Kconfig: Fix typo 'D2NET_V2'
  sound: Kconfig: drop unknown symbol ARCH_CLPS7500
  ...

Fix up trivial conflicts in arch/powerpc/platforms/40x/Kconfig (some new
kconfig additions, close to removed commented-out old ones)
parents b4a133da bd1b2a55

Documentation/ABI/testing/sysfs-driver-hid-logitech-lg4ff

+1 −1
Original line number Diff line number Diff line 
What:		/sys/module/hid_logitech/drivers/hid:logitech/<dev>/range.

Date:		July 2011

KernelVersion:	3.2

Contact:	Michal Malý <madcatxster@gmail.com>

Contact:	Michal Malý <madcatxster@gmail.com>

Description:	Display minimum, maximum and current range of the steering

		wheel. Writing a value within min and max boundaries sets the

		range of the wheel.

Documentation/cpu-freq/governors.txt

+1 −3
Original line number Diff line number Diff line
@@ -127,7 +127,7 @@ in the bash (as said, 1000 is default), do: 
echo `$(($(cat cpuinfo_transition_latency) * 750 / 1000)) \

    >ondemand/sampling_rate



show_sampling_rate_min:

sampling_rate_min:

The sampling rate is limited by the HW transition latency:

transition_latency * 100

Or by kernel restrictions:
@@ -140,8 +140,6 @@ HZ=100: min=200000us (200ms) 
The highest value of kernel and HW latency restrictions is shown and

used as the minimum sampling rate.



show_sampling_rate_max: THIS INTERFACE IS DEPRECATED, DON'T USE IT.



up_threshold: defines what the average CPU usage between the samplings

of 'sampling_rate' needs to be for the kernel to make a decision on

whether it should increase the frequency.  For example when it is set

Documentation/devices.txt

+1 −1
Original line number Diff line number Diff line
@@ -379,7 +379,7 @@ Your cooperation is appreciated. 
		162 = /dev/smbus	System Management Bus

		163 = /dev/lik		Logitech Internet Keyboard

		164 = /dev/ipmo		Intel Intelligent Platform Management

		165 = /dev/vmmon	VMWare virtual machine monitor

		165 = /dev/vmmon	VMware virtual machine monitor

		166 = /dev/i2o/ctl	I2O configuration manager

		167 = /dev/specialix_sxctl Specialix serial control

		168 = /dev/tcldrv	Technology Concepts serial control

Documentation/scsi/53c700.txt

+1 −20
Original line number Diff line number Diff line
@@ -16,32 +16,13 @@ fill in to get the driver working. 
Compile Time Flags

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



The driver may be either io mapped or memory mapped.  This is

selectable by configuration flags:



CONFIG_53C700_MEM_MAPPED



define if the driver is memory mapped.



CONFIG_53C700_IO_MAPPED



define if the driver is to be io mapped.



One or other of the above flags *must* be defined.



Other flags are:

A compile time flag is:



CONFIG_53C700_LE_ON_BE



define if the chipset must be supported in little endian mode on a big

endian architecture (used for the 700 on parisc).



CONFIG_53C700_USE_CONSISTENT



allocate consistent memory (should only be used if your architecture

has a mixture of consistent and inconsistent memory).  Fully

consistent or fully inconsistent architectures should not define this.





Using the Chip Core Driver

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

Documentation/vgaarbiter.txt

+1 −1
Original line number Diff line number Diff line
@@ -177,7 +177,7 @@ II. Credits 


Benjamin Herrenschmidt (IBM?) started this work when he discussed such design

with the Xorg community in 2005 [1, 2]. In the end of 2007, Paulo Zanoni and

Tiago Vignatti (both of C3SL/Federal University of Paraná) proceeded his work

Tiago Vignatti (both of C3SL/Federal University of Paraná) proceeded his work

enhancing the kernel code to adapt as a kernel module and also did the

implementation of the user space side [3]. Now (2009) Tiago Vignatti and Dave

Airlie finally put this work in shape and queued to Jesse Barnes' PCI tree.