Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6: (61 commits)
  Dynamic debug: fix pr_fmt() build error
  Dynamic debug: allow simple quoting of words
  dynamic debug: update docs
  dynamic debug: combine dprintk and dynamic printk
  sysfs: fix some bin_vm_ops errors
  kobject: don't block for each kobject_uevent
  sysfs: only allow one scheduled removal callback per kobj
  Driver core: Fix device_move() vs. dpm list ordering, v2
  Driver core: some cleanup on drivers/base/sys.c
  Driver core: implement uevent suppress in kobject
  vcs: hook sysfs devices into object lifetime instead of "binding"
  driver core: fix passing platform_data
  driver core: move platform_data into platform_device
  sysfs: don't block indefinitely for unmapped files.
  driver core: move knode_bus into private structure
  driver core: move knode_driver into private structure
  driver core: move klist_children into private structure
  driver core: create a private portion of struct device
  driver core: remove polling for driver_probe_done(v5)
  sysfs: reference sysfs_dirent from sysfs inodes
  ...

Fixed conflicts in drivers/sh/maple/maple.c manually

1 files changed, 25 insertions, 4 deletions

diff --git a/Documentation/DocBook/uio-howto.tmpl b/Documentation/DocBook/uio-howto.tmpl
index 52e1b79ce0e6..8f6e3b2403c7 100644
--- a/Documentation/DocBook/uio-howto.tmpl
+++ b/Documentation/DocBook/uio-howto.tmpl
@@ -42,6 +42,13 @@ GPL version 2.
 
 <revhistory>
         <revision>
+        <revnumber>0.8</revnumber>
+        <date>2008-12-24</date>
+        <authorinitials>hjk</authorinitials>
+        <revremark>Added name attributes in mem and portio sysfs directories.
+                </revremark>
+        </revision>
+        <revision>
         <revnumber>0.7</revnumber>
         <date>2008-12-23</date>
         <authorinitials>hjk</authorinitials>
@@ -303,12 +310,19 @@ interested in translating it, please email me
         appear if the size of the mapping is not 0.
 </para>
 <para>
-        Each <filename>mapX/</filename> directory contains two read-only files
-        that show start address and size of the memory:
+        Each <filename>mapX/</filename> directory contains four read-only files
+        that show attributes of the memory:
 </para>
 <itemizedlist>
 <listitem>
         <para>
+        <filename>name</filename>: A string identifier for this mapping. This
+        is optional, the string can be empty. Drivers can set this to make it
+        easier for userspace to find the correct mapping.
+        </para>
+</listitem>
+<listitem>
+        <para>
         <filename>addr</filename>: The address of memory that can be mapped.
         </para>
 </listitem>
@@ -366,12 +380,19 @@ offset = N * getpagesize();
         <filename>/sys/class/uio/uioX/portio/</filename>.
 </para>
 <para>
-        Each <filename>portX/</filename> directory contains three read-only
-        files that show start, size, and type of the port region:
+        Each <filename>portX/</filename> directory contains four read-only
+        files that show name, start, size, and type of the port region:
 </para>
 <itemizedlist>
 <listitem>
         <para>
+        <filename>name</filename>: A string identifier for this port region.
+        The string is optional and can be empty. Drivers can set it to make it
+        easier for userspace to find a certain port region.
+        </para>
+</listitem>
+<listitem>
+        <para>
         <filename>start</filename>: The first port of this region.
         </para>
 </listitem>