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

Commit 59e52534 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: (59 commits)
  MAINTAINERS: linux-m32r is moderated for non-subscribers
  linux@lists.openrisc.net is moderated for non-subscribers
  Drop default from "DM365 codec select" choice
  parisc: Kconfig: cleanup Kernel page size default
  Kconfig: remove redundant CONFIG_ prefix on two symbols
  cris: remove arch/cris/arch-v32/lib/nand_init.S
  microblaze: add missing CONFIG_ prefixes
  h8300: drop puzzling Kconfig dependencies
  MAINTAINERS: microblaze-uclinux@itee.uq.edu.au is moderated for non-subscribers
  tty: drop superfluous dependency in Kconfig
  ARM: mxc: fix Kconfig typo 'i.MX51'
  Fix file references in Kconfig files
  aic7xxx: fix Kconfig references to READMEs
  Fix file references in drivers/ide/
  thinkpad_acpi: Fix printk typo 'bluestooth'
  bcmring: drop commented out line in Kconfig
  btmrvl_sdio: fix typo 'btmrvl_sdio_sd6888'
  doc: raw1394: Trivial typo fix
  CIFS: Don't free volume_info->UNC until we are entirely done with it.
  treewide: Correct spelling of successfully in comments
  ...
parents 73692d9b 0d89e54c

Documentation/ABI/removed/o2cb

+1 −1
Original line number Diff line number Diff line 
What:		/sys/o2cb symlink

Date:		May 2011

KernelVersion:	2.6.40

KernelVersion:	3.0

Contact:	ocfs2-devel@oss.oracle.com

Description:	This is a symlink: /sys/o2cb to /sys/fs/o2cb. The symlink is

		removed when new versions of ocfs2-tools which know to look

Documentation/ABI/removed/raw1394

+1 −1
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ Description: 
	/dev/raw1394 was a character device file that allowed low-level

	access to FireWire buses.  Its major drawbacks were its inability

	to implement sensible device security policies, and its low level

	of abstraction that required userspace clients do duplicate much

	of abstraction that required userspace clients to duplicate much

	of the kernel's ieee1394 core functionality.

	Replaced by /dev/fw*, i.e. the <linux/firewire-cdev.h> ABI of

	firewire-core.

Documentation/ABI/testing/sysfs-bus-bcma

+4 −4
Original line number Diff line number Diff line 
What:		/sys/bus/bcma/devices/.../manuf

Date:		May 2011

KernelVersion:	2.6.40

KernelVersion:	3.0

Contact:	Rafał Miłecki <zajec5@gmail.com>

Description:

		Each BCMA core has it's manufacturer id. See
@@ -8,7 +8,7 @@ Description: 


What:		/sys/bus/bcma/devices/.../id

Date:		May 2011

KernelVersion:	2.6.40

KernelVersion:	3.0

Contact:	Rafał Miłecki <zajec5@gmail.com>

Description:

		There are a few types of BCMA cores, they can be identified by
@@ -16,7 +16,7 @@ Description: 


What:		/sys/bus/bcma/devices/.../rev

Date:		May 2011

KernelVersion:	2.6.40

KernelVersion:	3.0

Contact:	Rafał Miłecki <zajec5@gmail.com>

Description:

		BCMA cores of the same type can still slightly differ depending
@@ -24,7 +24,7 @@ Description: 


What:		/sys/bus/bcma/devices/.../class

Date:		May 2011

KernelVersion:	2.6.40

KernelVersion:	3.0

Contact:	Rafał Miłecki <zajec5@gmail.com>

Description:

		Each BCMA core is identified by few fields, including class it

Documentation/ABI/testing/sysfs-class-backlight-driver-adp8870

+8 −8
Original line number Diff line number Diff line
@@ -4,8 +4,8 @@ What: /sys/class/backlight/<backlight>/l2_bright_max 
What:		/sys/class/backlight/<backlight>/l3_office_max

What:		/sys/class/backlight/<backlight>/l4_indoor_max

What:		/sys/class/backlight/<backlight>/l5_dark_max

Date:		Mai 2011

KernelVersion:	2.6.40

Date:		May 2011

KernelVersion:	3.0

Contact:	device-drivers-devel@blackfin.uclinux.org

Description:

		Control the maximum brightness for <ambient light zone>
@@ -18,8 +18,8 @@ What: /sys/class/backlight/<backlight>/l2_bright_dim 
What:		/sys/class/backlight/<backlight>/l3_office_dim

What:		/sys/class/backlight/<backlight>/l4_indoor_dim

What:		/sys/class/backlight/<backlight>/l5_dark_dim

Date:		Mai 2011

KernelVersion:	2.6.40

Date:		May 2011

KernelVersion:	3.0

Contact:	device-drivers-devel@blackfin.uclinux.org

Description:

		Control the dim brightness for <ambient light zone>
@@ -29,8 +29,8 @@ Description: 
		this <ambient light zone>.



What:		/sys/class/backlight/<backlight>/ambient_light_level

Date:		Mai 2011

KernelVersion:	2.6.40

Date:		May 2011

KernelVersion:	3.0

Contact:	device-drivers-devel@blackfin.uclinux.org

Description:

		Get conversion value of the light sensor.
@@ -39,8 +39,8 @@ Description: 
		8000 (max ambient brightness)



What:		/sys/class/backlight/<backlight>/ambient_light_zone

Date:		Mai 2011

KernelVersion:	2.6.40

Date:		May 2011

KernelVersion:	3.0

Contact:	device-drivers-devel@blackfin.uclinux.org

Description:

		Get/Set current ambient light zone. Reading returns

Documentation/PCI/pci.txt

+1 −1
Original line number Diff line number Diff line
@@ -314,7 +314,7 @@ from the PCI device config space. Use the values in the pci_dev structure 
as the PCI "bus address" might have been remapped to a "host physical"

address by the arch/chip-set specific kernel support.



See Documentation/IO-mapping.txt for how to access device registers

See Documentation/io-mapping.txt for how to access device registers

or device memory.



The device driver needs to call pci_request_region() to verify