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

Commit edb15d83 authored by Ralf Baechle's avatar Ralf Baechle
Browse files

Merge branch 'master' of... 

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into mips-for-linux-next

Conflicts:
    include/linux/ssb/ssb_driver_gige.h

Also resolves a logical merge conflict in drivers/net/ethernet/broadcom/-
bgmac.c due to change of an API.
parents 8bfc245f a0b1c429

Documentation/ABI/testing/sysfs-bus-event_source-devices-events

0 → 100644
+62 −0
Original line number Diff line number Diff line 
What:		/sys/devices/cpu/events/

		/sys/devices/cpu/events/branch-misses

		/sys/devices/cpu/events/cache-references

		/sys/devices/cpu/events/cache-misses

		/sys/devices/cpu/events/stalled-cycles-frontend

		/sys/devices/cpu/events/branch-instructions

		/sys/devices/cpu/events/stalled-cycles-backend

		/sys/devices/cpu/events/instructions

		/sys/devices/cpu/events/cpu-cycles



Date:		2013/01/08



Contact:	Linux kernel mailing list <linux-kernel@vger.kernel.org>



Description:	Generic performance monitoring events



		A collection of performance monitoring events that may be

		supported by many/most CPUs. These events can be monitored

		using the 'perf(1)' tool.



		The contents of each file would look like:



			event=0xNNNN



		where 'N' is a hex digit and the number '0xNNNN' shows the

		"raw code" for the perf event identified by the file's

		"basename".





What: 		/sys/devices/cpu/events/PM_LD_MISS_L1

		/sys/devices/cpu/events/PM_LD_REF_L1

		/sys/devices/cpu/events/PM_CYC

		/sys/devices/cpu/events/PM_BRU_FIN

		/sys/devices/cpu/events/PM_GCT_NOSLOT_CYC

		/sys/devices/cpu/events/PM_BRU_MPRED

		/sys/devices/cpu/events/PM_INST_CMPL

		/sys/devices/cpu/events/PM_CMPLU_STALL



Date:		2013/01/08



Contact:	Linux kernel mailing list <linux-kernel@vger.kernel.org>

		Linux Powerpc mailing list <linuxppc-dev@ozlabs.org>



Description:	POWER-systems specific performance monitoring events



		A collection of performance monitoring events that may be

		supported by the POWER CPU. These events can be monitored

		using the 'perf(1)' tool.



		These events may not be supported by other CPUs.



		The contents of each file would look like:



			event=0xNNNN



		where 'N' is a hex digit and the number '0xNNNN' shows the

		"raw code" for the perf event identified by the file's

		"basename".



		Further, multiple terms like 'event=0xNNNN' can be specified

		and separated with comma. All available terms are defined in

		the /sys/bus/event_source/devices/<dev>/format file.

Documentation/ABI/testing/sysfs-devices-power_resources_D0

0 → 100644
+13 −0
Original line number Diff line number Diff line 
What:		/sys/devices/.../power_resources_D0/

Date:		January 2013

Contact:	Rafael J. Wysocki <rafael.j.wysocki@intel.com>

Description:

		The /sys/devices/.../power_resources_D0/ directory is only

		present for device objects representing ACPI device nodes that

		use ACPI power resources for power management.



		If present, it contains symbolic links to device directories

		representing ACPI power resources that need to be turned on for

		the given device node to be in ACPI power state D0.  The names

		of the links are the same as the names of the directories they

		point to.

Documentation/ABI/testing/sysfs-devices-power_resources_D1

0 → 100644
+14 −0
Original line number Diff line number Diff line 
What:		/sys/devices/.../power_resources_D1/

Date:		January 2013

Contact:	Rafael J. Wysocki <rafael.j.wysocki@intel.com>

Description:

		The /sys/devices/.../power_resources_D1/ directory is only

		present for device objects representing ACPI device nodes that

		use ACPI power resources for power management and support ACPI

		power state D1.



		If present, it contains symbolic links to device directories

		representing ACPI power resources that need to be turned on for

		the given device node to be in ACPI power state D1.  The names

		of the links are the same as the names of the directories they

		point to.

Documentation/ABI/testing/sysfs-devices-power_resources_D2

0 → 100644
+14 −0
Original line number Diff line number Diff line 
What:		/sys/devices/.../power_resources_D2/

Date:		January 2013

Contact:	Rafael J. Wysocki <rafael.j.wysocki@intel.com>

Description:

		The /sys/devices/.../power_resources_D2/ directory is only

		present for device objects representing ACPI device nodes that

		use ACPI power resources for power management and support ACPI

		power state D2.



		If present, it contains symbolic links to device directories

		representing ACPI power resources that need to be turned on for

		the given device node to be in ACPI power state D2.  The names

		of the links are the same as the names of the directories they

		point to.

Documentation/ABI/testing/sysfs-devices-power_resources_D3hot

0 → 100644
+14 −0
Original line number Diff line number Diff line 
What:		/sys/devices/.../power_resources_D3hot/

Date:		January 2013

Contact:	Rafael J. Wysocki <rafael.j.wysocki@intel.com>

Description:

		The /sys/devices/.../power_resources_D3hot/ directory is only

		present for device objects representing ACPI device nodes that

		use ACPI power resources for power management and support ACPI

		power state D3hot.



		If present, it contains symbolic links to device directories

		representing ACPI power resources that need to be turned on for

		the given device node to be in ACPI power state D3hot.  The

		names of the links are the same as the names of the directories

		they point to.