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

Commit 681e4a5e authored by Konrad Rzeszutek Wilk's avatar Konrad Rzeszutek Wilk
Browse files

Merge commit 'c104f1fa' into stable/for-linus-3.4 

* commit 'c104f1fa': (14566 commits)
  cpufreq: OMAP: fix build errors: depends on ARCH_OMAP2PLUS
  sparc64: Eliminate obsolete __handle_softirq() function
  sparc64: Fix bootup crash on sun4v.
  kconfig: delete last traces of __enabled_ from autoconf.h
  Revert "kconfig: fix __enabled_ macros definition for invisible and un-selected symbols"
  kconfig: fix IS_ENABLED to not require all options to be defined
  irq_domain: fix type mismatch in debugfs output format
  staging: android: fix mem leaks in __persistent_ram_init()
  staging: vt6656: Don't leak memory in drivers/staging/vt6656/ioctl.c::private_ioctl()
  staging: iio: hmc5843: Fix crash in probe function.
  panic: fix stack dump print on direct call to panic()
  drivers/rtc/rtc-pl031.c: enable clock on all ST variants
  Revert "mm: vmscan: fix misused nr_reclaimed in shrink_mem_cgroup_zone()"
  hugetlb: fix race condition in hugetlb_fault()
  drivers/rtc/rtc-twl.c: use static register while reading time
  drivers/rtc/rtc-s3c.c: add placeholder for driver private data
  drivers/rtc/rtc-s3c.c: fix compilation error
  MAINTAINERS: add PCDP console maintainer
  memcg: do not open code accesses to res_counter members
  drivers/rtc/rtc-efi.c: fix section mismatch warning
  ...
parents b960d6c4 c104f1fa

CREDITS

+5 −0
Original line number Diff line number Diff line
@@ -514,6 +514,11 @@ S: Bessemerstraat 21 
S: Amsterdam

S: The Netherlands



N: NeilBrown

E: neil@brown.name

P: 4096R/566281B9 1BC6 29EB D390 D870 7B5F  497A 39EC 9EDD 5662 81B9

D: NFSD Maintainer 2000-2007



N: Zach Brown

E: zab@zabbo.net

D: maestro pci sound

Documentation/00-INDEX

+4 −2
Original line number Diff line number Diff line
@@ -7,8 +7,8 @@ Please try and keep the descriptions small enough to fit on one line. 


Following translations are available on the WWW:



   - Japanese, maintained by the JF Project (JF@linux.or.jp), at

     http://www.linux.or.jp/JF/

   - Japanese, maintained by the JF Project (jf@listserv.linux.or.jp), at

     http://linuxjf.sourceforge.jp/



00-INDEX

	- this file.
@@ -104,6 +104,8 @@ cpuidle/ 
	- info on CPU_IDLE, CPU idle state management subsystem.

cputopology.txt

	- documentation on how CPU topology info is exported via sysfs.

crc32.txt

	- brief tutorial on CRC computation

cris/

	- directory with info about Linux on CRIS architecture.

crypto/

Documentation/ABI/obsolete/sysfs-class-rfkill

+1 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ Date: 09-Jul-2007 
KernelVersion	v2.6.22

Contact:	linux-wireless@vger.kernel.org

Description: 	Current state of the transmitter.

		This file is deprecated and sheduled to be removed in 2014,

		This file is deprecated and scheduled to be removed in 2014,

		because its not possible to express the 'soft and hard block'

		state of the rfkill driver.

Values: 	A numeric value.

Documentation/ABI/removed/devfs

+1 −1
Original line number Diff line number Diff line 
What:		devfs

Date:		July 2005 (scheduled), finally removed in kernel v2.6.18

Contact:	Greg Kroah-Hartman <gregkh@suse.de>

Contact:	Greg Kroah-Hartman <gregkh@linuxfoundation.org>

Description:

	devfs has been unmaintained for a number of years, has unfixable

	races, contains a naming policy within the kernel that is

Documentation/ABI/stable/sysfs-driver-usb-usbtmc

+13 −13
Original line number Diff line number Diff line 
What:		/sys/bus/usb/drivers/usbtmc/devices/*/interface_capabilities

What:		/sys/bus/usb/drivers/usbtmc/devices/*/device_capabilities

What:		/sys/bus/usb/drivers/usbtmc/*/interface_capabilities

What:		/sys/bus/usb/drivers/usbtmc/*/device_capabilities

Date:		August 2008

Contact:	Greg Kroah-Hartman <gregkh@suse.de>

Contact:	Greg Kroah-Hartman <gregkh@linuxfoundation.org>

Description:

		These files show the various USB TMC capabilities as described

		by the device itself.  The full description of the bitfields
@@ -12,10 +12,10 @@ Description: 
		The files are read only.





What:		/sys/bus/usb/drivers/usbtmc/devices/*/usb488_interface_capabilities

What:		/sys/bus/usb/drivers/usbtmc/devices/*/usb488_device_capabilities

What:		/sys/bus/usb/drivers/usbtmc/*/usb488_interface_capabilities

What:		/sys/bus/usb/drivers/usbtmc/*/usb488_device_capabilities

Date:		August 2008

Contact:	Greg Kroah-Hartman <gregkh@suse.de>

Contact:	Greg Kroah-Hartman <gregkh@linuxfoundation.org>

Description:

		These files show the various USB TMC capabilities as described

		by the device itself.  The full description of the bitfields
@@ -27,9 +27,9 @@ Description: 
		The files are read only.





What:		/sys/bus/usb/drivers/usbtmc/devices/*/TermChar

What:		/sys/bus/usb/drivers/usbtmc/*/TermChar

Date:		August 2008

Contact:	Greg Kroah-Hartman <gregkh@suse.de>

Contact:	Greg Kroah-Hartman <gregkh@linuxfoundation.org>

Description:

		This file is the TermChar value to be sent to the USB TMC

		device as described by the document, "Universal Serial Bus Test
@@ -40,9 +40,9 @@ Description: 
		sent to the device or not.





What:		/sys/bus/usb/drivers/usbtmc/devices/*/TermCharEnabled

What:		/sys/bus/usb/drivers/usbtmc/*/TermCharEnabled

Date:		August 2008

Contact:	Greg Kroah-Hartman <gregkh@suse.de>

Contact:	Greg Kroah-Hartman <gregkh@linuxfoundation.org>

Description:

		This file determines if the TermChar is to be sent to the

		device on every transaction or not.  For more details about
@@ -51,11 +51,11 @@ Description: 
		published by the USB-IF.





What:		/sys/bus/usb/drivers/usbtmc/devices/*/auto_abort

What:		/sys/bus/usb/drivers/usbtmc/*/auto_abort

Date:		August 2008

Contact:	Greg Kroah-Hartman <gregkh@suse.de>

Contact:	Greg Kroah-Hartman <gregkh@linuxfoundation.org>

Description:

		This file determines if the the transaction of the USB TMC

		This file determines if the transaction of the USB TMC

		device is to be automatically aborted if there is any error.

		For more details about this, please see the document,

		"Universal Serial Bus Test and Measurement Class Specification