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

Commit 0e789314 authored by Dmitry Torokhov's avatar Dmitry Torokhov
Browse files

Merge commit 'v2.6.35-rc3' into for-linus

parents f5dec511 7e27d6e7
Loading
Loading
Loading
Loading
+1 −0
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ modules.builtin
*.gz
*.bz2
*.lzma
*.lzo
*.patch
*.gcno

+7 −0
Original line number Diff line number Diff line
filesystems/dnotify_test
laptops/dslm
timers/hpet_example
vm/hugepage-mmap
vm/hugepage-shm
vm/map_hugetlb
+0 −40
Original line number Diff line number Diff line
@@ -133,46 +133,6 @@ Description:
		The symbolic link points to the PCI device sysfs entry of the
		Physical Function this device associates with.


What:		/sys/bus/pci/slots/...
Date:		April 2005 (possibly older)
KernelVersion:	2.6.12 (possibly older)
Contact:	linux-pci@vger.kernel.org
Description:
		When the appropriate driver is loaded, it will create a
		directory per claimed physical PCI slot in
		/sys/bus/pci/slots/.  The names of these directories are
		specific to the driver, which in turn, are specific to the
		platform, but in general, should match the label on the
		machine's physical chassis.

		The drivers that can create slot directories include the
		PCI hotplug drivers, and as of 2.6.27, the pci_slot driver.

		The slot directories contain, at a minimum, a file named
		'address' which contains the PCI bus:device:function tuple.
		Other files may appear as well, but are specific to the
		driver.

What:		/sys/bus/pci/slots/.../function[0-7]
Date:		March 2010
KernelVersion:	2.6.35
Contact:	linux-pci@vger.kernel.org
Description:
		If PCI slot directories (as described above) are created,
		and the physical slot is actually populated with a device,
		symbolic links in the slot directory pointing to the
		device's PCI functions are created as well.

What:		/sys/bus/pci/devices/.../slot
Date:		March 2010
KernelVersion:	2.6.35
Contact:	linux-pci@vger.kernel.org
Description:
		If PCI slot directories (as described above) are created,
		a symbolic link pointing to the slot directory will be
		created as well.

What:		/sys/bus/pci/slots/.../module
Date:		June 2009
Contact:	linux-pci@vger.kernel.org
+6 −6
Original line number Diff line number Diff line
@@ -389,7 +389,7 @@
      </para>
      <para>
	If your driver supports memory management (it should!), you'll
	need to set that up at load time as well.  How you intialize
	need to set that up at load time as well.  How you initialize
	it depends on which memory manager you're using, TTM or GEM.
      </para>
      <sect3>
@@ -399,7 +399,7 @@
	  aperture space for graphics devices. TTM supports both UMA devices
	  and devices with dedicated video RAM (VRAM), i.e. most discrete
	  graphics devices.  If your device has dedicated RAM, supporting
	  TTM is desireable.  TTM also integrates tightly with your
	  TTM is desirable.  TTM also integrates tightly with your
	  driver specific buffer execution function.  See the radeon
	  driver for examples.
	</para>
@@ -443,7 +443,7 @@
	  likely eventually calling ttm_bo_global_init and
	  ttm_bo_global_release, respectively.  Also like the previous
	  object, ttm_global_item_ref is used to create an initial reference
	  count for the TTM, which will call your initalization function.
	  count for the TTM, which will call your initialization function.
	</para>
      </sect3>
      <sect3>
@@ -557,7 +557,7 @@ void intel_crt_init(struct drm_device *dev)
	  CRT connector and encoder combination is created.  A device
	  specific i2c bus is also created, for fetching EDID data and
	  performing monitor detection.  Once the process is complete,
	  the new connector is regsitered with sysfs, to make its
	  the new connector is registered with sysfs, to make its
	  properties available to applications.
	</para>
	<sect4>
@@ -581,12 +581,12 @@ void intel_crt_init(struct drm_device *dev)
	<para>
	  For each encoder, CRTC and connector, several functions must
	  be provided, depending on the object type.  Encoder objects
	  need should provide a DPMS (basically on/off) function, mode fixup
	  need to provide a DPMS (basically on/off) function, mode fixup
	  (for converting requested modes into native hardware timings),
	  and prepare, set and commit functions for use by the core DRM
	  helper functions.  Connector helpers need to provide mode fetch and
	  validity functions as well as an encoder matching function for
	  returing an ideal encoder for a given connector.  The core
	  returning an ideal encoder for a given connector.  The core
	  connector functions include a DPMS callback, (deprecated)
	  save/restore routines, detection, mode probing, property handling,
	  and cleanup functions.
+1 −1
Original line number Diff line number Diff line
@@ -58,7 +58,7 @@ MPEG stream embedded, sliced VBI data format in this specification.
</contrib>
	<affiliation>
	  <address>
	    <email>awalls@radix.net</email>
	    <email>awalls@md.metrocast.net</email>
	  </address>
	</affiliation>
      </author>
Loading