30 files changed, 362 insertions, 492 deletions

diff --git a/Documentation/00-INDEX b/Documentation/00-INDEX
index 30b327a116ea..042073f656e5 100644
--- a/Documentation/00-INDEX
+++ b/Documentation/00-INDEX
@@ -183,8 +183,6 @@ i386/
         - directory with info about Linux on Intel 32 bit architecture.
 ia64/
         - directory with info about Linux on Intel 64 bit architecture.
-ide.txt
-        - important info for users of ATA devices (IDE/EIDE disks and CD-ROMS).
 infiniband/
         - directory with documents concerning Linux InfiniBand support.
 initrd.txt
diff --git a/Documentation/DocBook/kernel-api.tmpl b/Documentation/DocBook/kernel-api.tmpl
index f31601e8bd89..dc0f30c3e571 100644
--- a/Documentation/DocBook/kernel-api.tmpl
+++ b/Documentation/DocBook/kernel-api.tmpl
@@ -361,12 +361,14 @@ X!Edrivers/pnp/system.c
   <chapter id="blkdev">
      <title>Block Devices</title>
 !Eblock/blk-core.c
+!Iblock/blk-core.c
 !Eblock/blk-map.c
 !Iblock/blk-sysfs.c
 !Eblock/blk-settings.c
 !Eblock/blk-exec.c
 !Eblock/blk-barrier.c
 !Eblock/blk-tag.c
+!Iblock/blk-tag.c
   </chapter>
 
   <chapter id="chrdev">
diff --git a/Documentation/atomic_ops.txt b/Documentation/atomic_ops.txt
index f20c10c2858f..4ef245010457 100644
--- a/Documentation/atomic_ops.txt
+++ b/Documentation/atomic_ops.txt
@@ -186,7 +186,8 @@ If the atomic value v is not equal to u, this function adds a to v, and
 returns non zero. If v is equal to u then it returns zero. This is done as
 an atomic operation.
 
-atomic_add_unless requires explicit memory barriers around the operation.
+atomic_add_unless requires explicit memory barriers around the operation
+unless it fails (returns 0).
 
 atomic_inc_not_zero, equivalent to atomic_add_unless(v, 1, 0)
 
diff --git a/Documentation/cdrom/ide-cd b/Documentation/cdrom/ide-cd
index 29721bfcde12..91c0dcc6fa5c 100644
--- a/Documentation/cdrom/ide-cd
+++ b/Documentation/cdrom/ide-cd
@@ -45,7 +45,7 @@ This driver provides the following features:
 ---------------
 
 0. The ide-cd relies on the ide disk driver.  See
-   Documentation/ide.txt for up-to-date information on the ide
+   Documentation/ide/ide.txt for up-to-date information on the ide
    driver.
 
 1. Make sure that the ide and ide-cd drivers are compiled into the
@@ -64,7 +64,7 @@ This driver provides the following features:
 
    Depending on what type of IDE interface you have, you may need to
    specify additional configuration options.  See
-   Documentation/ide.txt.
+   Documentation/ide/ide.txt.
 
 2. You should also ensure that the iso9660 filesystem is either
    compiled into the kernel or available as a loadable module.  You
@@ -84,7 +84,7 @@ This driver provides the following features:
    on the primary IDE interface are called `hda' and `hdb',
    respectively.  The drives on the secondary interface are called
    `hdc' and `hdd'.  (Interfaces at other locations get other letters
-   in the third position; see Documentation/ide.txt.)
+   in the third position; see Documentation/ide/ide.txt.)
 
    If you want your CDROM drive to be found automatically by the
    driver, you should make sure your IDE interface uses either the
@@ -93,7 +93,7 @@ This driver provides the following features:
    be jumpered as `master'.  (If for some reason you cannot configure
    your system in this manner, you can probably still use the driver.
    You may have to pass extra configuration information to the kernel
-   when you boot, however.  See Documentation/ide.txt for more
+   when you boot, however.  See Documentation/ide/ide.txt for more
    information.)
 
 4. Boot the system.  If the drive is recognized, you should see a
@@ -201,7 +201,7 @@ TEST
 This section discusses some common problems encountered when trying to
 use the driver, and some possible solutions.  Note that if you are
 experiencing problems, you should probably also review
-Documentation/ide.txt for current information about the underlying
+Documentation/ide/ide.txt for current information about the underlying
 IDE support code.  Some of these items apply only to earlier versions
 of the driver, but are mentioned here for completeness.
 
@@ -211,7 +211,7 @@ from the driver.
 a. Drive is not detected during booting.
 
    - Review the configuration instructions above and in
-     Documentation/ide.txt, and check how your hardware is
+     Documentation/ide/ide.txt, and check how your hardware is
      configured.
 
    - If your drive is the only device on an IDE interface, it should
@@ -219,7 +219,7 @@ a. Drive is not detected during booting.
 
    - If your IDE interface is not at the standard addresses of 0x170
      or 0x1f0, you'll need to explicitly inform the driver using a
-     lilo option.  See Documentation/ide.txt.  (This feature was
+     lilo option.  See Documentation/ide/ide.txt.  (This feature was
      added around kernel version 1.3.30.)
 
    - If the autoprobing is not finding your drive, you can tell the
@@ -245,7 +245,7 @@ a. Drive is not detected during booting.
      Support for some interfaces needing extra initialization is
      provided in later 1.3.x kernels.  You may need to turn on
      additional kernel configuration options to get them to work;
-     see Documentation/ide.txt.
+     see Documentation/ide/ide.txt.
 
      Even if support is not available for your interface, you may be
      able to get it to work with the following procedure.  First boot
@@ -299,7 +299,7 @@ c. System hangups.
     be worked around by specifying the `serialize' option when
     booting.  Recent kernels should be able to detect the need for
     this automatically in most cases, but the detection is not
-    foolproof.  See Documentation/ide.txt for more information
+    foolproof.  See Documentation/ide/ide.txt for more information
     about the `serialize' option and the CMD640B.
 
   - Note that many MS-DOS CDROM drivers will work with such buggy
diff --git a/Documentation/cgroups.txt b/Documentation/cgroups.txt
index 42d7c4cb39cd..31d12e21ff8a 100644
--- a/Documentation/cgroups.txt
+++ b/Documentation/cgroups.txt
@@ -28,7 +28,7 @@ CONTENTS:
 4. Questions
 
 1. Control Groups
-==========
+=================
 
 1.1 What are cgroups ?
 ----------------------
@@ -143,10 +143,10 @@ proliferation of such cgroups.
 
 Also lets say that the administrator would like to give enhanced network
 access temporarily to a student's browser (since it is night and the user
-wants to do online gaming :)  OR give one of the students simulation
+wants to do online gaming :))  OR give one of the students simulation
 apps enhanced CPU power,
 
-With ability to write pids directly to resource classes, its just a
+With ability to write pids directly to resource classes, it's just a
 matter of :
 
        # echo pid > /mnt/network/<new_class>/tasks
@@ -227,10 +227,13 @@ Each cgroup is represented by a directory in the cgroup file system
 containing the following files describing that cgroup:
 
  - tasks: list of tasks (by pid) attached to that cgroup
- - notify_on_release flag: run /sbin/cgroup_release_agent on exit?
+ - releasable flag: cgroup currently removeable?
+ - notify_on_release flag: run the release agent on exit?
+ - release_agent: the path to use for release notifications (this file
+   exists in the top cgroup only)
 
 Other subsystems such as cpusets may add additional files in each
-cgroup dir
+cgroup dir.
 
 New cgroups are created using the mkdir system call or shell
 command.  The properties of a cgroup, such as its flags, are
@@ -257,7 +260,7 @@ performance.
 To allow access from a cgroup to the css_sets (and hence tasks)
 that comprise it, a set of cg_cgroup_link objects form a lattice;
 each cg_cgroup_link is linked into a list of cg_cgroup_links for
-a single cgroup on its cont_link_list field, and a list of
+a single cgroup on its cgrp_link_list field, and a list of
 cg_cgroup_links for a single css_set on its cg_link_list.
 
 Thus the set of tasks in a cgroup can be listed by iterating over
@@ -271,9 +274,6 @@ for cgroups, with a minimum of additional kernel code.
 1.4 What does notify_on_release do ?
 ------------------------------------
 
-*** notify_on_release is disabled in the current patch set. It will be
-*** reactivated in a future patch in a less-intrusive manner
-
 If the notify_on_release flag is enabled (1) in a cgroup, then
 whenever the last task in the cgroup leaves (exits or attaches to
 some other cgroup) and the last child cgroup of that cgroup
@@ -360,8 +360,8 @@ Now you want to do something with this cgroup.
 
 In this directory you can find several files:
 # ls
-notify_on_release release_agent tasks
-(plus whatever files are added by the attached subsystems)
+notify_on_release releasable tasks
+(plus whatever files added by the attached subsystems)
 
 Now attach your shell to this cgroup:
 # /bin/echo $$ > tasks
@@ -404,19 +404,13 @@ with a subsystem id which will be assigned by the cgroup system.
 Other fields in the cgroup_subsys object include:
 
 - subsys_id: a unique array index for the subsystem, indicating which
-  entry in cgroup->subsys[] this subsystem should be
-  managing. Initialized by cgroup_register_subsys(); prior to this
-  it should be initialized to -1
+  entry in cgroup->subsys[] this subsystem should be managing.
 
-- hierarchy: an index indicating which hierarchy, if any, this
-  subsystem is currently attached to. If this is -1, then the
-  subsystem is not attached to any hierarchy, and all tasks should be
-  considered to be members of the subsystem's top_cgroup. It should
-  be initialized to -1.
+- name: should be initialized to a unique subsystem name. Should be
+  no longer than MAX_CGROUP_TYPE_NAMELEN.
 
-- name: should be initialized to a unique subsystem name prior to
-  calling cgroup_register_subsystem. Should be no longer than
-  MAX_CGROUP_TYPE_NAMELEN
+- early_init: indicate if the subsystem needs early initialization
+  at system boot.
 
 Each cgroup object created by the system has an array of pointers,
 indexed by subsystem id; this pointer is entirely managed by the
@@ -434,8 +428,6 @@ situation.
 See kernel/cgroup.c for more details.
 
 Subsystems can take/release the cgroup_mutex via the functions
-cgroup_lock()/cgroup_unlock(), and can
-take/release the callback_mutex via the functions
 cgroup_lock()/cgroup_unlock().
 
 Accessing a task's cgroup pointer may be done in the following ways:
@@ -444,7 +436,7 @@ Accessing a task's cgroup pointer may be done in the following ways:
 - inside an rcu_read_lock() section via rcu_dereference()
 
 3.3 Subsystem API
---------------------------
+-----------------
 
 Each subsystem should:
 
@@ -455,7 +447,8 @@ Each subsystem may export the following methods. The only mandatory
 methods are create/destroy. Any others that are null are presumed to
 be successful no-ops.
 
-struct cgroup_subsys_state *create(struct cgroup *cont)
+struct cgroup_subsys_state *create(struct cgroup_subsys *ss,
+                                   struct cgroup *cgrp)
 (cgroup_mutex held by caller)
 
 Called to create a subsystem state object for a cgroup. The
@@ -470,7 +463,7 @@ identified by the passed cgroup object having a NULL parent (since
 it's the root of the hierarchy) and may be an appropriate place for
 initialization code.
 
-void destroy(struct cgroup *cont)
+void destroy(struct cgroup_subsys *ss, struct cgroup *cgrp)
 (cgroup_mutex held by caller)
 
 The cgroup system is about to destroy the passed cgroup; the subsystem
@@ -481,7 +474,14 @@ cgroup->parent is still valid. (Note - can also be called for a
 newly-created cgroup if an error occurs after this subsystem's
 create() method has been called for the new cgroup).
 
-int can_attach(struct cgroup_subsys *ss, struct cgroup *cont,
+void pre_destroy(struct cgroup_subsys *ss, struct cgroup *cgrp);
+(cgroup_mutex held by caller)
+
+Called before checking the reference count on each subsystem. This may
+be useful for subsystems which have some extra references even if
+there are not tasks in the cgroup.
+
+int can_attach(struct cgroup_subsys *ss, struct cgroup *cgrp,
                struct task_struct *task)
 (cgroup_mutex held by caller)
 
@@ -492,8 +492,8 @@ unspecified task can be moved into the cgroup. Note that this isn't
 called on a fork. If this method returns 0 (success) then this should
 remain valid while the caller holds cgroup_mutex.
 
-void attach(struct cgroup_subsys *ss, struct cgroup *cont,
-            struct cgroup *old_cont, struct task_struct *task)
+void attach(struct cgroup_subsys *ss, struct cgroup *cgrp,
+            struct cgroup *old_cgrp, struct task_struct *task)
 
 Called after the task has been attached to the cgroup, to allow any
 post-attachment activity that requires memory allocations or blocking.
@@ -505,9 +505,9 @@ registration for all existing tasks.
 
 void exit(struct cgroup_subsys *ss, struct task_struct *task)
 
-Called during task exit
+Called during task exit.
 
-int populate(struct cgroup_subsys *ss, struct cgroup *cont)
+int populate(struct cgroup_subsys *ss, struct cgroup *cgrp)
 
 Called after creation of a cgroup to allow a subsystem to populate
 the cgroup directory with file entries.  The subsystem should make
@@ -516,7 +516,7 @@ include/linux/cgroup.h for details).  Note that although this
 method can return an error code, the error code is currently not
 always handled well.
 
-void post_clone(struct cgroup_subsys *ss, struct cgroup *cont)
+void post_clone(struct cgroup_subsys *ss, struct cgroup *cgrp)
 
 Called at the end of cgroup_clone() to do any paramater
 initialization which might be required before a task could attach.  For
diff --git a/Documentation/controllers/memory.txt b/Documentation/controllers/memory.txt
index b5bbea92a61a..866b9cd9a959 100644
--- a/Documentation/controllers/memory.txt
+++ b/Documentation/controllers/memory.txt
@@ -1,4 +1,8 @@
-Memory Controller
+Memory Resource Controller
+
+NOTE: The Memory Resource Controller has been generically been referred
+to as the memory controller in this document. Do not confuse memory controller
+used here with the memory controller that is used in hardware.
 
 Salient features
 
@@ -152,7 +156,7 @@ The memory controller uses the following hierarchy
 
 a. Enable CONFIG_CGROUPS
 b. Enable CONFIG_RESOURCE_COUNTERS
-c. Enable CONFIG_CGROUP_MEM_CONT
+c. Enable CONFIG_CGROUP_MEM_RES_CTLR
 
 1. Prepare the cgroups
 # mkdir -p /cgroups
@@ -164,20 +168,20 @@ c. Enable CONFIG_CGROUP_MEM_CONT
 
 Since now we're in the 0 cgroup,
 We can alter the memory limit:
-# echo -n 4M > /cgroups/0/memory.limit_in_bytes
+# echo 4M > /cgroups/0/memory.limit_in_bytes
 
 NOTE: We can use a suffix (k, K, m, M, g or G) to indicate values in kilo,
 mega or gigabytes.
 
 # cat /cgroups/0/memory.limit_in_bytes
-4194304 Bytes
+4194304
 
 NOTE: The interface has now changed to display the usage in bytes
 instead of pages
 
 We can check the usage:
 # cat /cgroups/0/memory.usage_in_bytes
-1216512 Bytes
+1216512
 
 A successful write to this file does not guarantee a successful set of
 this limit to the value written into the file.  This can be due to a
@@ -185,9 +189,9 @@ number of factors, such as rounding up to page boundaries or the total
 availability of memory on the system.  The user is required to re-read
 this file after a write to guarantee the value committed by the kernel.
 
-# echo -n 1 > memory.limit_in_bytes
+# echo 1 > memory.limit_in_bytes
 # cat memory.limit_in_bytes
-4096 Bytes
+4096
 
 The memory.failcnt field gives the number of times that the cgroup limit was
 exceeded.
@@ -197,7 +201,7 @@ caches, RSS and Active pages/Inactive pages are shown.
 
 The memory.force_empty gives an interface to drop *all* charges by force.
 
-# echo -n 1 > memory.force_empty
+# echo 1 > memory.force_empty
 
 will drop all charges in cgroup. Currently, this is maintained for test.
 
@@ -233,13 +237,6 @@ cgroup might have some charge associated with it, even though all
 tasks have migrated away from it. Such charges are automatically dropped at
 rmdir() if there are no tasks.
 
-4.4 Choosing what to account  -- Page Cache (unmapped) vs RSS (mapped)?
-
-The type of memory accounted by the cgroup can be limited to just
-mapped pages by writing "1" to memory.control_type field
-
-echo -n 1 > memory.control_type
-
 5. TODO
 
 1. Add support for accounting huge pages (as a separate controller)
@@ -262,18 +259,19 @@ References
 3. Emelianov, Pavel. Resource controllers based on process cgroups
    http://lkml.org/lkml/2007/3/6/198
 4. Emelianov, Pavel. RSS controller based on process cgroups (v2)
-   http://lkml.org/lkml/2007/4/9/74
+   http://lkml.org/lkml/2007/4/9/78
 5. Emelianov, Pavel. RSS controller based on process cgroups (v3)
    http://lkml.org/lkml/2007/5/30/244
 6. Menage, Paul. Control Groups v10, http://lwn.net/Articles/236032/
 7. Vaidyanathan, Srinivasan, Control Groups: Pagecache accounting and control
    subsystem (v3), http://lwn.net/Articles/235534/
-8. Singh, Balbir. RSS controller V2 test results (lmbench),
+8. Singh, Balbir. RSS controller v2 test results (lmbench),
    http://lkml.org/lkml/2007/5/17/232
-9. Singh, Balbir. RSS controller V2 AIM9 results
+9. Singh, Balbir. RSS controller v2 AIM9 results
    http://lkml.org/lkml/2007/5/18/1
-10. Singh, Balbir. Memory controller v6 results,
+10. Singh, Balbir. Memory controller v6 test results,
     http://lkml.org/lkml/2007/8/19/36
-11. Singh, Balbir. Memory controller v6, http://lkml.org/lkml/2007/8/17/69
+11. Singh, Balbir. Memory controller introduction (v6),
+    http://lkml.org/lkml/2007/8/17/69
 12. Corbet, Jonathan, Controlling memory use in cgroups,
     http://lwn.net/Articles/243795/
diff --git a/Documentation/cpusets.txt b/Documentation/cpusets.txt
index 43db6fe12814..ad2bb3b3acc1 100644
--- a/Documentation/cpusets.txt
+++ b/Documentation/cpusets.txt
@@ -209,7 +209,7 @@ and name space for cpusets, with a minimum of additional kernel code.
 The cpus and mems files in the root (top_cpuset) cpuset are
 read-only.  The cpus file automatically tracks the value of
 cpu_online_map using a CPU hotplug notifier, and the mems file
-automatically tracks the value of node_states[N_MEMORY]--i.e.,
+automatically tracks the value of node_states[N_HIGH_MEMORY]--i.e.,
 nodes with memory--using the cpuset_track_online_nodes() hook.
 
 
diff --git a/Documentation/debugging-via-ohci1394.txt b/Documentation/debugging-via-ohci1394.txt
index de4804e8b396..c360d4e91b48 100644
--- a/Documentation/debugging-via-ohci1394.txt
+++ b/Documentation/debugging-via-ohci1394.txt
@@ -36,14 +36,15 @@ available (notebooks) or too slow for extensive debug information (like ACPI).
 Drivers
 -------
 
-The OHCI-1394 drivers in drivers/firewire and drivers/ieee1394 initialize
-the OHCI-1394 controllers to a working state and can be used to enable
-physical DMA. By default you only have to load the driver, and physical
-DMA access will be granted to all remote nodes, but it can be turned off
-when using the ohci1394 driver.
-
-Because these drivers depend on the PCI enumeration to be completed, an
-initialization routine which can runs pretty early (long before console_init(),
+The ohci1394 driver in drivers/ieee1394 initializes the OHCI-1394 controllers
+to a working state and enables physical DMA by default for all remote nodes.
+This can be turned off by ohci1394's module parameter phys_dma=0.
+
+The alternative firewire-ohci driver in drivers/firewire uses filtered physical
+DMA, hence is not yet suitable for remote debugging.
+
+Because ohci1394 depends on the PCI enumeration to be completed, an
+initialization routine which runs pretty early (long before console_init()
 which makes the printk buffer appear on the console can be called) was written.
 
 To activate it, enable CONFIG_PROVIDE_OHCI1394_DMA_INIT (Kernel hacking menu:
diff --git a/Documentation/feature-removal-schedule.txt b/Documentation/feature-removal-schedule.txt
index 4d3aa519eadf..c1d1fd0c299b 100644
--- a/Documentation/feature-removal-schedule.txt
+++ b/Documentation/feature-removal-schedule.txt
@@ -172,6 +172,16 @@ Who:	Len Brown <len.brown@intel.com>
 
 ---------------------------
 
+What:   ide-tape driver
+When:   July 2008
+Files:  drivers/ide/ide-tape.c
+Why:    This driver might not have any users anymore and maintaining it for no
+        reason is an effort no one wants to make.
+Who:    Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>, Borislav Petkov
+        <petkovbb@googlemail.com>
+
+---------------------------
+
 What: libata spindown skipping and warning
 When: Dec 2008
 Why:  Some halt(8) implementations synchronize caches for and spin
@@ -306,3 +316,15 @@ Why:	Largely unmaintained and almost entirely unused.  File system
         is largely pointless as without a lot of work only the most
         trivial of Solaris binaries can work with the emulation code.
 Who:    David S. Miller <davem@davemloft.net>
+
+---------------------------
+
+What:   init_mm export
+When:   2.6.26
+Why:    Not used in-tree. The current out-of-tree users used it to
+        work around problems in the CPA code which should be resolved
+        by now. One usecase was described to provide verification code
+        of the CPA operation. That's a good idea in general, but such
+        code / infrastructure should be in the kernel and not in some
+        out-of-tree driver.
+Who:    Thomas Gleixner <tglx@linutronix.de>
diff --git a/Documentation/gpio.txt b/Documentation/gpio.txt
index 8da724e2a0ff..54630095aa3c 100644
--- a/Documentation/gpio.txt
+++ b/Documentation/gpio.txt
@@ -2,6 +2,9 @@ GPIO Interfaces
 
 This provides an overview of GPIO access conventions on Linux.
 
+These calls use the gpio_* naming prefix.  No other calls should use that
+prefix, or the related __gpio_* prefix.
+
 
 What is a GPIO?
 ===============
@@ -69,11 +72,13 @@ in this document, but drivers acting as clients to the GPIO interface must
 not care how it's implemented.)
 
 That said, if the convention is supported on their platform, drivers should
-use it when possible.  Platforms should declare GENERIC_GPIO support in
-Kconfig (boolean true), which multi-platform drivers can depend on when
-using the include file:
+use it when possible.  Platforms must declare GENERIC_GPIO support in their
+Kconfig (boolean true), and provide an <asm/gpio.h> file.  Drivers that can't
+work without standard GPIO calls should have Kconfig entries which depend
+on GENERIC_GPIO.  The GPIO calls are available, either as "real code" or as
+optimized-away stubs, when drivers use the include file:
 
-        #include <asm/gpio.h>
+        #include <linux/gpio.h>
 
 If you stick to this convention then it'll be easier for other developers to
 see what your code is doing, and help maintain it.
@@ -316,6 +321,9 @@ pulldowns integrated on some platforms.  Not all platforms support them,
 or support them in the same way; and any given board might use external
 pullups (or pulldowns) so that the on-chip ones should not be used.
 (When a circuit needs 5 kOhm, on-chip 100 kOhm resistors won't do.)
+Likewise drive strength (2 mA vs 20 mA) and voltage (1.8V vs 3.3V) is a
+platform-specific issue, as are models like (not) having a one-to-one
+correspondence between configurable pins and GPIOs.
 
 There are other system-specific mechanisms that are not specified here,
 like the aforementioned options for input de-glitching and wire-OR output.
diff --git a/Documentation/hwmon/adt7473 b/Documentation/hwmon/adt7473
new file mode 100644
index 000000000000..22d8b19046ab
--- /dev/null
+++ b/Documentation/hwmon/adt7473
@@ -0,0 +1,79 @@
+Kernel driver adt7473
+======================
+
+Supported chips:
+  * Analog Devices ADT7473
+    Prefix: 'adt7473'
+    Addresses scanned: I2C 0x2C, 0x2D, 0x2E
+    Datasheet: Publicly available at the Analog Devices website
+
+Author: Darrick J. Wong
+
+Description
+-----------
+
+This driver implements support for the Analog Devices ADT7473 chip family.
+
+The LM85 uses the 2-wire interface compatible with the SMBUS 2.0
+specification. Using an analog to digital converter it measures three (3)
+temperatures and two (2) voltages. It has three (3) 16-bit counters for
+measuring fan speed. There are three (3) PWM outputs that can be used
+to control fan speed.
+
+A sophisticated control system for the PWM outputs is designed into the
+LM85 that allows fan speed to be adjusted automatically based on any of the
+three temperature sensors. Each PWM output is individually adjustable and
+programmable. Once configured, the ADT7473 will adjust the PWM outputs in
+response to the measured temperatures without further host intervention.
+This feature can also be disabled for manual control of the PWM's.
+
+Each of the measured inputs (voltage, temperature, fan speed) has
+corresponding high/low limit values. The ADT7473 will signal an ALARM if
+any measured value exceeds either limit.
+
+The ADT7473 samples all inputs continuously. The driver will not read
+the registers more often than once every other second. Further,
+configuration data is only read once per minute.
+
+Special Features
+----------------
+
+The ADT7473 have a 10-bit ADC and can therefore measure temperatures
+with 0.25 degC resolution. Temperature readings can be configured either
+for twos complement format or "Offset 64" format, wherein 63 is subtracted
+from the raw value to get the temperature value.
+
+The Analog Devices datasheet is very detailed and describes a procedure for
+determining an optimal configuration for the automatic PWM control.
+
+Hardware Configurations
+-----------------------
+
+The ADT7473 chips have an optional SMBALERT output that can be used to
+signal the chipset in case a limit is exceeded or the temperature sensors
+fail. Individual sensor interrupts can be masked so they won't trigger
+SMBALERT. The SMBALERT output if configured replaces the PWM2 function.
+
+Configuration Notes
+-------------------
+
+Besides standard interfaces driver adds the following:
+
+* PWM Control
+
+* pwm#_auto_point1_pwm and pwm#_auto_point1_temp and
+* pwm#_auto_point2_pwm and pwm#_auto_point2_temp -
+
+point1: Set the pwm speed at a lower temperature bound.
+point2: Set the pwm speed at a higher temperature bound.
+
+The ADT7473 will scale the pwm between the lower and higher pwm speed when
+the temperature is between the two temperature boundaries.  PWM values range
+from 0 (off) to 255 (full speed).
+
+Notes
+-----
+
+The NVIDIA binary driver presents an ADT7473 chip via an on-card i2c bus.
+Unfortunately, they fail to set the i2c adapter class, so this driver may
+fail to find the chip until the nvidia driver is patched.
diff --git a/Documentation/hwmon/coretemp b/Documentation/hwmon/coretemp
index 170bf862437b..dbbe6c7025b0 100644
--- a/Documentation/hwmon/coretemp
+++ b/Documentation/hwmon/coretemp
@@ -4,9 +4,10 @@ Kernel driver coretemp
 Supported chips:
   * All Intel Core family
     Prefix: 'coretemp'
-    CPUID: family 0x6, models 0xe, 0xf, 0x16
+    CPUID: family 0x6, models 0xe, 0xf, 0x16, 0x17
     Datasheet: Intel 64 and IA-32 Architectures Software Developer's Manual
                Volume 3A: System Programming Guide
+               http://softwarecommunity.intel.com/Wiki/Mobility/720.htm
 
 Author: Rudolf Marek
 
@@ -25,7 +26,8 @@ may be raised, if the temperature grows enough (more than TjMax) to trigger
 the Out-Of-Spec bit. Following table summarizes the exported sysfs files:
 
 temp1_input      - Core temperature (in millidegrees Celsius).
-temp1_crit       - Maximum junction temperature  (in millidegrees Celsius).
+temp1_max        - All cooling devices should be turned on (on Core2).
+temp1_crit       - Maximum junction temperature (in millidegrees Celsius).
 temp1_crit_alarm - Set when Out-of-spec bit is set, never clears.
                    Correct CPU operation is no longer guaranteed.
 temp1_label      - Contains string "Core X", where X is processor
diff --git a/Documentation/i2c/busses/i2c-i801 b/Documentation/i2c/busses/i2c-i801
index 3bd958360159..c31e0291e167 100644
--- a/Documentation/i2c/busses/i2c-i801
+++ b/Documentation/i2c/busses/i2c-i801
@@ -12,8 +12,9 @@ Supported adapters:
   * Intel 82801G (ICH7)
   * Intel 631xESB/632xESB (ESB2)
   * Intel 82801H (ICH8)
-  * Intel ICH9
+  * Intel 82801I (ICH9)
   * Intel Tolapai
+  * Intel ICH10
    Datasheets: Publicly available at the Intel website
 
 Authors: 
diff --git a/Documentation/ide/00-INDEX b/Documentation/ide/00-INDEX
new file mode 100644
index 000000000000..d6b778842b75
--- /dev/null
+++ b/Documentation/ide/00-INDEX
@@ -0,0 +1,12 @@
+00-INDEX
+        - this file
+ChangeLog.ide-cd.1994-2004
+        - ide-cd changelog
+ChangeLog.ide-floppy.1996-2002
+        - ide-floppy changelog
+ChangeLog.ide-tape.1995-2002
+        - ide-tape changelog
+ide-tape.txt
+        - info on the IDE ATAPI streaming tape driver
+ide.txt
+        - important info for users of ATA devices (IDE/EIDE disks and CD-ROMS).
diff --git a/Documentation/ide.txt b/Documentation/ide/ide.txt
index 94e2e3b9e77f..e3b3425328b6 100644
--- a/Documentation/ide.txt
+++ b/Documentation/ide/ide.txt
@@ -3,11 +3,11 @@
 
 ==============================================================================
 
-   
+
    The hdparm utility can be used to control various IDE features on a
    running system. It is packaged separately.  Please Look for it on popular
    linux FTP sites.
-   
+
 
 
 ***  IMPORTANT NOTICES:  BUGGY IDE CHIPSETS CAN CORRUPT DATA!!
@@ -51,7 +51,7 @@ Common pitfalls:
 
 ================================================================================
 
-This is the multiple IDE interface driver, as evolved from hd.c.  
+This is the multiple IDE interface driver, as evolved from hd.c.
 
 It supports up to 9 IDE interfaces per default, on one or more IRQs (usually
 14 & 15).  There can be up to two drives per interface, as per the ATA-6 spec.
@@ -215,17 +215,17 @@ Summary of ide driver parameters for kernel command line
 --------------------------------------------------------
 
  "hdx="  is recognized for all "x" from "a" to "h", such as "hdc".
- 
+
  "idex=" is recognized for all "x" from "0" to "3", such as "ide1".
 
  "hdx=noprobe"          : drive may be present, but do not probe for it
- 
+
  "hdx=none"             : drive is NOT present, ignore cmos and do not probe
- 
+
  "hdx=nowerr"           : ignore the WRERR_STAT bit on this drive
- 
+
  "hdx=cdrom"            : drive is present, and is a cdrom drive
- 
+
  "hdx=cyl,head,sect"    : disk drive is present, with specified geometry
 
  "hdx=remap"            : remap access of sector 0 to sector 1 (for EZDrive)
@@ -258,12 +258,10 @@ Summary of ide driver parameters for kernel command line
                           As for VLB, it is safest to not specify it.
                           Bigger values are safer than smaller ones.
 
- "idex=noprobe"         : do not attempt to access/use this interface
- 
  "idex=base"            : probe for an interface at the addr specified,
                           where "base" is usually 0x1f0 or 0x170
                           and "ctl" is assumed to be "base"+0x206
-                          
+
  "idex=base,ctl"        : specify both base and ctl
 
  "idex=base,ctl,irq"    : specify base, ctl, and irq number
@@ -274,7 +272,7 @@ Summary of ide driver parameters for kernel command line
                           to take effect.
 
  "idex=four"            : four drives on idex and ide(x^1) share same ports
-                        
+
  "idex=reset"           : reset interface after probe
 
  "idex=ata66"           : informs the interface that it has an 80c cable
@@ -309,53 +307,6 @@ are detected automatically).
 
 ================================================================================
 
-IDE ATAPI streaming tape driver
--------------------------------
-
-This driver is a part of the Linux ide driver and works in co-operation
-with linux/drivers/block/ide.c.
-
-The driver, in co-operation with ide.c, basically traverses the
-request-list for the block device interface. The character device
-interface, on the other hand, creates new requests, adds them
-to the request-list of the block device, and waits for their completion.
-
-Pipelined operation mode is now supported on both reads and writes.
-
-The block device major and minor numbers are determined from the
-tape's relative position in the ide interfaces, as explained in ide.c.
-
-The character device interface consists of the following devices:
-
- ht0            major 37, minor 0       first  IDE tape, rewind on close.
- ht1            major 37, minor 1       second IDE tape, rewind on close.
- ...
- nht0           major 37, minor 128     first  IDE tape, no rewind on close.
- nht1           major 37, minor 129     second IDE tape, no rewind on close.
- ...
-
-Run /dev/MAKEDEV to create the above entries.
-
-The general magnetic tape commands compatible interface, as defined by
-include/linux/mtio.h, is accessible through the character device.
-
-General ide driver configuration options, such as the interrupt-unmask
-flag, can be configured by issuing an ioctl to the block device interface,
-as any other ide device.
-
-Our own ide-tape ioctl's can be issued to either the block device or
-the character device interface.
-
-Maximal throughput with minimal bus load will usually be achieved in the
-following scenario:
-
-        1.      ide-tape is operating in the pipelined operation mode.
-        2.      No buffering is performed by the user backup program.
-
-
-
-================================================================================
-
 Some Terminology
 ----------------
 IDE = Integrated Drive Electronics, meaning that each drive has a built-in
diff --git a/Documentation/ja_JP/stable_kernel_rules.txt b/Documentation/ja_JP/stable_kernel_rules.txt
index 17d87519e468..b3ffe870de33 100644
--- a/Documentation/ja_JP/stable_kernel_rules.txt
+++ b/Documentation/ja_JP/stable_kernel_rules.txt
@@ -11,69 +11,69 @@ comment or update of this file, please try to update Original(English)
 file at first.
 
 ==================================
-�れ��
+�れ��
 linux-2.6.24/Documentation/stable_kernel_rules.txt
-�和訳��。
+�和訳��。
 
-翻訳団体： JF プロジェクト < http://www.linux.or.jp/JF/ >
-翻訳日： 2007/12/30
-翻訳者： Tsugikazu Shibata <tshibata at ab dot jp dot nec dot com>
-校正者： 武井伸光ã�•ã‚“ã€�<takei at webmasters dot gr dot jp>
-         ����ん (Seiji Kaneko) <skaneko at a2 dot mbn dot or dot jp>
-         å°�林 雅典ã�•ã‚“ (Masanori Kobayasi) <zap03216 at nifty dot ne dot jp>
-         野å�£ã�•ã‚“ (Kenji Noguchi) <tokyo246 at gmail dot com>
-         神宮信太郎ã�•ã‚“ <jin at libjingu dot jp>
+翻訳団体： JF プロジェクト < http://www.linux.or.jp/JF/ >
+翻訳日： 2007/12/30
+翻訳者： Tsugikazu Shibata <tshibata at ab dot jp dot nec dot com>
+校正者： 武井伸光�ん�<takei at webmasters dot gr dot jp>
+         ����ん (Seiji Kaneko) <skaneko at a2 dot mbn dot or dot jp>
+         �林 雅典�ん (Masanori Kobayasi) <zap03216 at nifty dot ne dot jp>
+         野��ん (Kenji Noguchi) <tokyo246 at gmail dot com>
+         神宮信太郎�ん <jin at libjingu dot jp>
 ==================================
 
-ã�šã�£ã�¨çŸ¥ã‚Šã�Ÿã�‹ã�£ã�Ÿ Linux 2.6 -stable リリースã�®å…¨ã�¦
+���知り���� Linux 2.6 -stable リリース�全�
 
-"-stable" ツリーã�«ã�©ã�®ã‚ˆã�†ã�ªç¨®é¡žã�®ãƒ‘ッãƒ�ã�Œå�—ã�‘入れられるã�‹ã€�ã�©ã�®ã‚ˆã�†ã�ª
-もã�®ã�Œå�—ã�‘入れられã�ªã�„ã�‹ã€�ã�«ã�¤ã�„ã�¦ã�®è¦�則-
+"-stable" ツリー���よ��種類�パッ����入れられる����よ��
+も����入れられ����������則-
 
- - 明らã�‹ã�«æ­£ã�—ã��ã€�テストã�•ã‚Œã�¦ã�„ã‚‹ã‚‚ã�®ã�§ã�ªã�‘ã‚Œã�°ã�ªã‚‰ã�ªã�„。
- - 文脈(変更行ã�®å‰�後)をå�«ã‚�ã�¦ 100 行より大ã��ã��ã�¦ã�¯ã�„ã�‘ã�ªã�„。
- - ã�Ÿã� ä¸€å€‹ã�®ã�“ã�¨ã� ã�‘を修正ã�—ã�¦ã�„ã‚‹ã�¹ã��。
- - 皆を悩ã�¾ã�›ã�¦ã�„る本物ã�®ãƒ�グを修正ã�—ã�ªã�‘ã‚Œã�°ã�ªã‚‰ã�ªã�„。("ã�“ã‚Œã�¯ãƒ�グã�§
-   �る�も�れ���..." �よ��も�����)
- - ビルドエラー(CONFIG_BROKENã�«ã�ªã�£ã�¦ã�„ã‚‹ã‚‚ã�®ã‚’除ã��), oops, ãƒ�ングã€�デー
-   タ破壊ã€�ç�¾å®Ÿã�®ã‚»ã‚­ãƒ¥ãƒªãƒ†ã‚£å•�題ã€�ã��ã�®ä»– "ã�‚ã�‚ã€�ã�“ã‚Œã�¯ãƒ€ãƒ¡ã� ã�­"ã�¨ã�„ã�†
-   よã�†ã�ªã‚‚ã�®ã‚’修正ã�—ã�ªã�‘ã‚Œã�°ã�ªã‚‰ã�ªã�„。短ã��言ã�ˆã�°ã€�é‡�大ã�ªå•�題。
- - ã�©ã�®ã‚ˆã�†ã�«ç«¶å�ˆçŠ¶æ…‹ã�Œç™ºç”Ÿã�™ã‚‹ã�‹ã�®èª¬æ˜Žã‚‚一緒ã�«æ›¸ã�‹ã‚Œã�¦ã�„ã�ªã�„é™�りã€�
-   "ç�†è«–çš„ã�«ã�¯ç«¶å�ˆçŠ¶æ…‹ã�«ã�ªã‚‹"よã�†ã�ªã‚‚ã�®ã�¯ä¸�å�¯ã€‚
- - ã�„ã�‹ã�ªã‚‹äº›ç´°ã�ªä¿®æ­£ã‚‚å�«ã‚�るã�“ã�¨ã�¯ã�§ã��ã�ªã�„。(スペルã�®ä¿®æ­£ã€�空白ã�®ã‚¯ãƒªãƒ¼
-   ンアップã�ªã�©)
- - 対応ã�™ã‚‹ã‚µãƒ–システムメンテナã�Œå�—ã�‘入れã�Ÿã‚‚ã�®ã�§ã�ªã�‘ã‚Œã�°ã�ªã‚‰ã�ªã�„。
- - Documentation/SubmittingPatches ã�®è¦�則ã�«å¾“ã�£ã�Ÿã‚‚ã�®ã�§ã�ªã�‘ã‚Œã�°ã�ªã‚‰ã�ªã�„。
+ - 明ら��正���テスト�れ��るも����れ��ら��。
+ - 文脈(変更行��後)を��� 100 行より大��������。
+ - ��一個�����を修正���る��。
+ - 皆を悩����る本物��グを修正���れ��ら��。("�れ��グ�
+   �る�も�れ���..." �よ��も�����)
+ - ビルドエラー(CONFIG_BROKEN�����るも�を除�), oops, �ング�デー
+   タ破壊��実�セキュリティ�題���他 "����れ�ダメ��"���
+   よ��も�を修正���れ��ら��。短�言����大��題。
+ - ��よ��競�状態�発生�る��説明も一緒�書�れ�����り�
+   "�論的��競�状態��る"よ��も����。
+ - ���る些細�修正も��る�������。(スペル�修正�空白�クリー
+   ンアップ��)
+ - 対応�るサブシステムメンテナ���入れ�も����れ��ら��。
+ - Documentation/SubmittingPatches ��則�従��も����れ��ら��。
 
--stable ツリーã�«ãƒ‘ッãƒ�をé€�付ã�™ã‚‹æ‰‹ç¶šã��-
+-stable ツリー�パッ�を�付�る手続�-
 
- - 上記ã�®è¦�則ã�«å¾“ã�£ã�¦ã�„ã‚‹ã�‹ã‚’確èª�ã�—ã�Ÿå¾Œã�«ã€�stable@kernel.org ã�«ãƒ‘ッãƒ�
-   をé€�る。
- - é€�信者ã�¯ãƒ‘ッãƒ�ã�Œã‚­ãƒ¥ãƒ¼ã�«å�—ã�‘付ã�‘られã�Ÿéš›ã�«ã�¯ ACK をã€�å�´ä¸‹ã�•ã‚Œã�Ÿå ´å�ˆ
-   ã�«ã�¯ NAK をå�—ã�‘å�–る。ã�“ã�®å��応ã�¯é–‹ç™ºè€…ã�Ÿã�¡ã�®ã‚¹ã‚±ã‚¸ãƒ¥ãƒ¼ãƒ«ã�«ã‚ˆã�£ã�¦ã€�数
-   日ã�‹ã�‹ã‚‹å ´å�ˆã�Œã�‚る。
- - もã�—å�—ã�‘å�–られã�Ÿã‚‰ã€�パッãƒ�ã�¯ä»–ã�®é–‹ç™ºè€…ã�Ÿã�¡ã�®ãƒ¬ãƒ“ューã�®ã�Ÿã‚�ã�«
-   -stable キューã�«è¿½åŠ ã�•ã‚Œã‚‹ã€‚
- - セキュリティパッãƒ�ã�¯ã�“ã�®ã‚¨ã‚¤ãƒªã‚¢ã‚¹ (stable@kernel.org) ã�«é€�られるã�¹
-   ã��ã�§ã�¯ã�ªã��ã€�代ã‚�りã�« security@kernel.org ã�®ã‚¢ãƒ‰ãƒ¬ã‚¹ã�«é€�られる。
+ - 上記��則�従���る�を確���後��stable@kernel.org �パッ�
+   を�る。
+ - �信者�パッ��キュー���付�られ�際�� ACK を��下�れ�場�
+   �� NAK を���る。���応�開発者���スケジュール�よ���数
+   日��る場���る。
+ - も����られ�ら�パッ��他�開発者���レビュー����
+   -stable キュー�追加�れる。
+ - セキュリティパッ����エイリアス (stable@kernel.org) ��られる�
+   ������代�り� security@kernel.org �アドレス��られる。
 
-レビューサイクル-
+レビューサイクル-
 
- - -stable メンテナã�Œãƒ¬ãƒ“ューサイクルを決ã‚�るã�¨ã��ã€�パッãƒ�ã�¯ãƒ¬ãƒ“ュー委
-   員会ã�¨ãƒ‘ッãƒ�ã�Œå½±éŸ¿ã�™ã‚‹é ˜åŸŸã�®ãƒ¡ãƒ³ãƒ†ãƒŠ(æ��供者ã�Œã��ã�®é ˜åŸŸã�®ãƒ¡ãƒ³ãƒ†ãƒŠã�§ç„¡
-   ã�„é™�り)ã�«é€�られã€�linux-kernel メーリングリストã�«CCã�•ã‚Œã‚‹ã€‚
- - レビュー委員会ã�¯ 48時間ã�®é–“ã�« ACK ã�‹ NAK を出ã�™ã€‚
- - もã�—パッãƒ�ã�Œå§”員会ã�®ãƒ¡ãƒ³ãƒ�ã�‹ã‚‰å�´ä¸‹ã‚Œã‚‹ã�‹ã€�メンテナé�”やメンãƒ�ã�Œæ°—付
-   ã�‹ã�ªã�‹ã�£ã�Ÿå•�題ã�ŒæŒ�ã�¡ã�‚ã�Œã‚Šã€�linux-kernel メンãƒ�ã�Œãƒ‘ッãƒ�ã�«ç•°è­°ã‚’å”±ã�ˆ
-   ã�Ÿå ´å�ˆã�«ã�¯ã€�パッãƒ�ã�¯ã‚­ãƒ¥ãƒ¼ã�‹ã‚‰å‰Šé™¤ã�•ã‚Œã‚‹ã€‚
- - レビューサイクルã�®æœ€å¾Œã�«ã€�ACK をå�—ã�‘ã�Ÿãƒ‘ッãƒ�ã�¯æœ€æ–°ã�® -stable リリー
-   スã�«è¿½åŠ ã�•ã‚Œã€�ã��ã�®å¾Œã�«æ–°ã�—ã�„ -stable リリースã�Œè¡Œã‚�れる。
- - セキュリティパッãƒ�ã�¯ã€�通常ã�®ãƒ¬ãƒ“ューサイクルを通らã�šã€�セキュリティ
-   カーãƒ�ルãƒ�ームã�‹ã‚‰ç›´æŽ¥ -stable ツリーã�«å�—ã�‘付ã�‘られる。
-   ã�“ã�®æ‰‹ç¶šã��ã�®è©³ç´°ã�«ã�¤ã�„ã�¦ã�¯ kernel security ãƒ�ームã�«å•�ã�„å�ˆã‚�ã�›ã‚‹ã�“ã�¨ã€‚
+ - -stable メンテナ�レビューサイクルを決�る���パッ��レビュー委
+   員会�パッ��影響�る領域�メンテナ(�供者���領域�メンテナ�無
+   ��り)��られ�linux-kernel メーリングリスト�CC�れる。
+ - レビュー委員会� 48時間�間� ACK � NAK を出�。
+ - も�パッ��委員会�メン��ら�下�れる��メンテナ�やメン��気付
+   ������題�����り�linux-kernel メン��パッ��異議を唱�
+   �場����パッ��キュー�ら削除�れる。
+ - レビューサイクル�最後��ACK を���パッ��最新� -stable リリー
+   ス�追加�れ���後�新�� -stable リリース�行�れる。
+ - セキュリティパッ���通常�レビューサイクルを通ら��セキュリティ
+   カー�ル�ーム�ら直接 -stable ツリー���付�られる。
+   ��手続��詳細����� kernel security �ーム������る��。
 
-レビュー委員会-
+レビュー委員会-
 
- - ã�“ã�®å§”員会ã�¯ã€�ã�“ã�®ã‚¿ã‚¹ã‚¯ã�«ã�¤ã�„ã�¦æ´»å‹•ã�™ã‚‹å¤šã��ã�®ãƒœãƒ©ãƒ³ãƒ†ã‚£ã‚¢ã�¨ã€�少数ã�®
-   é�žãƒœãƒ©ãƒ³ãƒ†ã‚£ã‚¢ã�®ã‚«ãƒ¼ãƒ�ル開発者é�”ã�§æ§‹æˆ�ã�•ã‚Œã�¦ã�„る。
+ - ��委員会����タスク����活動�る多��ボランティア��少数�
+   �ボランティア�カー�ル開発者��構��れ��る。
 
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index 9a5b6658c65e..533e67febf81 100644
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -712,7 +712,7 @@ and is between 256 and 4096 characters. It is defined in the file
                         Format: <cyl>,<head>,<sect>
 
         hd?=            [HW] (E)IDE subsystem
-        hd?lun=         See Documentation/ide.txt.
+        hd?lun=         See Documentation/ide/ide.txt.
 
         highmem=nn[KMG] [KNL,BOOT] forces the highmem zone to have an exact
                         size of <nn>. This works even on boxes that have no
@@ -766,14 +766,14 @@ and is between 256 and 4096 characters. It is defined in the file
 
         ide=            [HW] (E)IDE subsystem
                         Format: ide=nodma or ide=doubler or ide=reverse
-                        See Documentation/ide.txt.
+                        See Documentation/ide/ide.txt.
 
         ide?=           [HW] (E)IDE subsystem
                         Format: ide?=noprobe or chipset specific parameters.
-                        See Documentation/ide.txt.
+                        See Documentation/ide/ide.txt.
 
         idebus=         [HW] (E)IDE subsystem - VLB/PCI bus speed
-                        See Documentation/ide.txt.
+                        See Documentation/ide/ide.txt.
 
         idle=           [X86]
                         Format: idle=poll or idle=mwait
diff --git a/Documentation/kprobes.txt b/Documentation/kprobes.txt
index 83f515c2905a..be89f393274f 100644
--- a/Documentation/kprobes.txt
+++ b/Documentation/kprobes.txt
@@ -192,7 +192,8 @@ code mapping.
 The Kprobes API includes a "register" function and an "unregister"
 function for each type of probe.  Here are terse, mini-man-page
 specifications for these functions and the associated probe handlers
-that you'll write.  See the latter half of this document for examples.
+that you'll write.  See the files in the samples/kprobes/ sub-directory
+for examples.
 
 4.1 register_kprobe
 
@@ -420,249 +421,15 @@ e. Watchpoint probes (which fire on data references).
 
 8. Kprobes Example
 
-Here's a sample kernel module showing the use of kprobes to dump a
-stack trace and selected i386 registers when do_fork() is called.
------ cut here -----
-/*kprobe_example.c*/
-#include <linux/kernel.h>
-#include <linux/module.h>
-#include <linux/kprobes.h>
-#include <linux/sched.h>
-
-/*For each probe you need to allocate a kprobe structure*/
-static struct kprobe kp;
-
-/*kprobe pre_handler: called just before the probed instruction is executed*/
-int handler_pre(struct kprobe *p, struct pt_regs *regs)
-{
-        printk("pre_handler: p->addr=0x%p, eip=%lx, eflags=0x%lx\n",
-                p->addr, regs->eip, regs->eflags);
-        dump_stack();
-        return 0;
-}
-
-/*kprobe post_handler: called after the probed instruction is executed*/
-void handler_post(struct kprobe *p, struct pt_regs *regs, unsigned long flags)
-{
-        printk("post_handler: p->addr=0x%p, eflags=0x%lx\n",
-                p->addr, regs->eflags);
-}
-
-/* fault_handler: this is called if an exception is generated for any
- * instruction within the pre- or post-handler, or when Kprobes
- * single-steps the probed instruction.
- */
-int handler_fault(struct kprobe *p, struct pt_regs *regs, int trapnr)
-{
-        printk("fault_handler: p->addr=0x%p, trap #%dn",
-                p->addr, trapnr);
-        /* Return 0 because we don't handle the fault. */
-        return 0;
-}
-
-static int __init kprobe_init(void)
-{
-        int ret;
-        kp.pre_handler = handler_pre;
-        kp.post_handler = handler_post;
-        kp.fault_handler = handler_fault;
-        kp.symbol_name = "do_fork";
-
-        ret = register_kprobe(&kp);
-        if (ret < 0) {
-                printk("register_kprobe failed, returned %d\n", ret);
-                return ret;
-        }
-        printk("kprobe registered\n");
-        return 0;
-}
-
-static void __exit kprobe_exit(void)
-{
-        unregister_kprobe(&kp);
-        printk("kprobe unregistered\n");
-}
-
-module_init(kprobe_init)
-module_exit(kprobe_exit)
-MODULE_LICENSE("GPL");
------ cut here -----
-
-You can build the kernel module, kprobe-example.ko, using the following
-Makefile:
------ cut here -----
-obj-m := kprobe-example.o
-KDIR := /lib/modules/$(shell uname -r)/build
-PWD := $(shell pwd)
-default:
-        $(MAKE) -C $(KDIR) SUBDIRS=$(PWD) modules
-clean:
-        rm -f *.mod.c *.ko *.o
------ cut here -----
-
-$ make
-$ su -
-...
-# insmod kprobe-example.ko
-
-You will see the trace data in /var/log/messages and on the console
-whenever do_fork() is invoked to create a new process.
+See samples/kprobes/kprobe_example.c
 
 9. Jprobes Example
 
-Here's a sample kernel module showing the use of jprobes to dump
-the arguments of do_fork().
------ cut here -----
-/*jprobe-example.c */
-#include <linux/kernel.h>
-#include <linux/module.h>
-#include <linux/fs.h>
-#include <linux/uio.h>
-#include <linux/kprobes.h>
-
-/*
- * Jumper probe for do_fork.
- * Mirror principle enables access to arguments of the probed routine
- * from the probe handler.
- */
-
-/* Proxy routine having the same arguments as actual do_fork() routine */
-long jdo_fork(unsigned long clone_flags, unsigned long stack_start,
-              struct pt_regs *regs, unsigned long stack_size,
-              int __user * parent_tidptr, int __user * child_tidptr)
-{
-        printk("jprobe: clone_flags=0x%lx, stack_size=0x%lx, regs=0x%p\n",
-               clone_flags, stack_size, regs);
-        /* Always end with a call to jprobe_return(). */
-        jprobe_return();
-        /*NOTREACHED*/
-        return 0;
-}
-
-static struct jprobe my_jprobe = {
-        .entry = jdo_fork
-};
-
-static int __init jprobe_init(void)
-{
-        int ret;
-        my_jprobe.kp.symbol_name = "do_fork";
-
-        if ((ret = register_jprobe(&my_jprobe)) <0) {
-                printk("register_jprobe failed, returned %d\n", ret);
-                return -1;
-        }
-        printk("Planted jprobe at %p, handler addr %p\n",
-               my_jprobe.kp.addr, my_jprobe.entry);
-        return 0;
-}
-
-static void __exit jprobe_exit(void)
-{
-        unregister_jprobe(&my_jprobe);
-        printk("jprobe unregistered\n");
-}
-
-module_init(jprobe_init)
-module_exit(jprobe_exit)
-MODULE_LICENSE("GPL");
------ cut here -----
-
-Build and insert the kernel module as shown in the above kprobe
-example.  You will see the trace data in /var/log/messages and on
-the console whenever do_fork() is invoked to create a new process.
-(Some messages may be suppressed if syslogd is configured to
-eliminate duplicate messages.)
+See samples/kprobes/jprobe_example.c
 
 10. Kretprobes Example
 
-Here's a sample kernel module showing the use of return probes to
-report failed calls to sys_open().
------ cut here -----
-/*kretprobe-example.c*/
-#include <linux/kernel.h>
-#include <linux/module.h>
-#include <linux/kprobes.h>
-#include <linux/ktime.h>
-
-/* per-instance private data */
-struct my_data {
-        ktime_t entry_stamp;
-};
-
-static const char *probed_func = "sys_open";
-
-/* Timestamp function entry. */
-static int entry_handler(struct kretprobe_instance *ri, struct pt_regs *regs)
-{
-        struct my_data *data;
-
-        if(!current->mm)
-                return 1; /* skip kernel threads */
-
-        data = (struct my_data *)ri->data;
-        data->entry_stamp = ktime_get();
-        return 0;
-}
-
-/* If the probed function failed, log the return value and duration.
- * Duration may turn out to be zero consistently, depending upon the
- * granularity of time accounting on the platform. */
-static int return_handler(struct kretprobe_instance *ri, struct pt_regs *regs)
-{
-        int retval = regs_return_value(regs);
-        struct my_data *data = (struct my_data *)ri->data;
-        s64 delta;
-        ktime_t now;
-
-        if (retval < 0) {
-                now = ktime_get();
-                delta = ktime_to_ns(ktime_sub(now, data->entry_stamp));
-                printk("%s: return val = %d (duration = %lld ns)\n",
-                       probed_func, retval, delta);
-        }
-        return 0;
-}
-
-static struct kretprobe my_kretprobe = {
-        .handler = return_handler,
-        .entry_handler = entry_handler,
-        .data_size = sizeof(struct my_data),
-        .maxactive = 20, /* probe up to 20 instances concurrently */
-};
-
-static int __init kretprobe_init(void)
-{
-        int ret;
-        my_kretprobe.kp.symbol_name = (char *)probed_func;
-
-        if ((ret = register_kretprobe(&my_kretprobe)) < 0) {
-                printk("register_kretprobe failed, returned %d\n", ret);
-                return -1;
-        }
-        printk("Kretprobe active on %s\n", my_kretprobe.kp.symbol_name);
-        return 0;
-}
-
-static void __exit kretprobe_exit(void)
-{
-        unregister_kretprobe(&my_kretprobe);
-        printk("kretprobe unregistered\n");
-        /* nmissed > 0 suggests that maxactive was set too low. */
-        printk("Missed probing %d instances of %s\n",
-               my_kretprobe.nmissed, probed_func);
-}
-
-module_init(kretprobe_init)
-module_exit(kretprobe_exit)
-MODULE_LICENSE("GPL");
------ cut here -----
-
-Build and insert the kernel module as shown in the above kprobe
-example.  You will see the trace data in /var/log/messages and on the
-console whenever sys_open() returns a negative value.  (Some messages
-may be suppressed if syslogd is configured to eliminate duplicate
-messages.)
+See samples/kprobes/kretprobe_example.c
 
 For additional information on Kprobes, refer to the following URLs:
 http://www-106.ibm.com/developerworks/library/l-kprobes.html?ca=dgr-lnxw42Kprobe
diff --git a/Documentation/laptops/thinkpad-acpi.txt b/Documentation/laptops/thinkpad-acpi.txt
index 6c2477754a2a..76cb428435da 100644
--- a/Documentation/laptops/thinkpad-acpi.txt
+++ b/Documentation/laptops/thinkpad-acpi.txt
@@ -160,7 +160,7 @@ Hot keys
 procfs: /proc/acpi/ibm/hotkey
 sysfs device attribute: hotkey_*
 
-In a ThinkPad, the ACPI HKEY handler is responsible for comunicating
+In a ThinkPad, the ACPI HKEY handler is responsible for communicating
 some important events and also keyboard hot key presses to the operating
 system.  Enabling the hotkey functionality of thinkpad-acpi signals the
 firmware that such a driver is present, and modifies how the ThinkPad
@@ -193,7 +193,7 @@ Not all bits in the mask can be modified.  Not all bits that can be
 modified do anything.  Not all hot keys can be individually controlled
 by the mask.  Some models do not support the mask at all, and in those
 models, hot keys cannot be controlled individually.  The behaviour of
-the mask is, therefore, higly dependent on the ThinkPad model.
+the mask is, therefore, highly dependent on the ThinkPad model.
 
 Note that unmasking some keys prevents their default behavior.  For
 example, if Fn+F5 is unmasked, that key will no longer enable/disable
@@ -288,7 +288,7 @@ sysfs notes:
                 in ACPI event mode, volume up/down/mute are reported as
                 separate events, but this behaviour may be corrected in
                 future releases of this driver, in which case the
-                ThinkPad volume mixer user interface semanthics will be
+                ThinkPad volume mixer user interface semantics will be
                 enforced.
 
         hotkey_poll_freq:
@@ -306,13 +306,20 @@ sysfs notes:
                 The recommended polling frequency is 10Hz.
 
         hotkey_radio_sw:
-                if the ThinkPad has a hardware radio switch, this
+                If the ThinkPad has a hardware radio switch, this
                 attribute will read 0 if the switch is in the "radios
-                disabled" postition, and 1 if the switch is in the
+                disabled" position, and 1 if the switch is in the
                 "radios enabled" position.
 
                 This attribute has poll()/select() support.
 
+        hotkey_tablet_mode:
+                If the ThinkPad has tablet capabilities, this attribute
+                will read 0 if the ThinkPad is in normal mode, and
+                1 if the ThinkPad is in tablet mode.
+
+                This attribute has poll()/select() support.
+
         hotkey_report_mode:
                 Returns the state of the procfs ACPI event report mode
                 filter for hot keys.  If it is set to 1 (the default),
@@ -339,7 +346,7 @@ sysfs notes:
         wakeup_hotunplug_complete:
                 Set to 1 if the system was waken up because of an
                 undock or bay ejection request, and that request
-                was sucessfully completed.  At this point, it might
+                was successfully completed.  At this point, it might
                 be useful to send the system back to sleep, at the
                 user's choice.  Refer to HKEY events 0x4003 and
                 0x3003, below.
@@ -392,7 +399,7 @@ event	code	Key		Notes
                                 Lenovo: battery
 
 0x1004  0x03    FN+F4           Sleep button (ACPI sleep button
-                                semanthics, i.e. sleep-to-RAM).
+                                semantics, i.e. sleep-to-RAM).
                                 It is always generate some kind
                                 of event, either the hot key
                                 event or a ACPI sleep button
@@ -403,12 +410,12 @@ event	code	Key		Notes
                                 time passes.
 
 0x1005  0x04    FN+F5           Radio.  Enables/disables
-                                the internal BlueTooth hardware
+                                the internal Bluetooth hardware
                                 and W-WAN card if left in control
                                 of the firmware.  Does not affect
                                 the WLAN card.
                                 Should be used to turn on/off all
-                                radios (bluetooth+W-WAN+WLAN),
+                                radios (Bluetooth+W-WAN+WLAN),
                                 really.
 
 0x1006  0x05    FN+F6           -
@@ -417,7 +424,7 @@ event	code	Key		Notes
                                 Do you feel lucky today?
 
 0x1008  0x07    FN+F8           IBM: toggle screen expand
-                                Lenovo: configure ultranav
+                                Lenovo: configure UltraNav
 
 0x1009  0x08    FN+F9           -
         ..      ..              ..
@@ -447,7 +454,7 @@ event	code	Key		Notes
 0x1011  0x10    FN+END          Brightness down.  See brightness
                                 up for details.
 
-0x1012  0x11    FN+PGUP         Thinklight toggle.  This key is
+0x1012  0x11    FN+PGUP         ThinkLight toggle.  This key is
                                 always handled by the firmware,
                                 even when unmasked.
 
@@ -469,7 +476,7 @@ event	code	Key		Notes
                                 key is always handled by the
                                 firmware, even when unmasked.
 
-0x1018  0x17    THINKPAD        Thinkpad/Access IBM/Lenovo key
+0x1018  0x17    THINKPAD        ThinkPad/Access IBM/Lenovo key
 
 0x1019  0x18    unknown
 ..      ..      ..
@@ -488,9 +495,17 @@ If a key is mapped to KEY_UNKNOWN, it generates an input event that
 includes an scan code.  If a key is mapped to anything else, it will
 generate input device EV_KEY events.
 
+In addition to the EV_KEY events, thinkpad-acpi may also issue EV_SW
+events for switches:
+
+SW_RADIO        T60 and later hardare rfkill rocker switch
+SW_TABLET_MODE  Tablet ThinkPads HKEY events 0x5009 and 0x500A
+
 Non hot-key ACPI HKEY event map:
 0x5001          Lid closed
 0x5002          Lid opened
+0x5009          Tablet swivel: switched to tablet mode
+0x500A          Tablet swivel: switched to normal mode
 0x7000          Radio Switch may have changed state
 
 The above events are not propagated by the driver, except for legacy
@@ -505,9 +520,7 @@ The above events are never propagated by the driver.
 
 0x3003          Bay ejection (see 0x2x05) complete, can sleep again
 0x4003          Undocked (see 0x2x04), can sleep again
-0x5009          Tablet swivel: switched to tablet mode
-0x500A          Tablet swivel: switched to normal mode
-0x500B          Tablet pen insterted into its storage bay
+0x500B          Tablet pen inserted into its storage bay
 0x500C          Tablet pen removed from its storage bay
 0x5010          Brightness level changed (newer Lenovo BIOSes)
 
@@ -539,7 +552,7 @@ sysfs (it is read-only).
 If the hotkey_report_mode module parameter is set to 1 or 2, it cannot
 be changed later through sysfs (any writes will return -EPERM to signal
 that hotkey_report_mode was locked.  On 2.6.23 and later, where
-hotkey_report_mode cannot be changed at all, writes will return -EACES).
+hotkey_report_mode cannot be changed at all, writes will return -EACCES).
 
 hotkey_report_mode set to 1 makes the driver export through the procfs
 ACPI event interface all hot key presses (which are *also* sent to the
@@ -584,7 +597,7 @@ Sysfs notes:
                 0: disables Bluetooth / Bluetooth is disabled
                 1: enables Bluetooth / Bluetooth is enabled.
 
-        Note: this interface will be probably be superseeded by the
+        Note: this interface will be probably be superseded by the
         generic rfkill class, so it is NOT to be considered stable yet.
 
 Video output control -- /proc/acpi/ibm/video
@@ -791,12 +804,12 @@ on the X40 (tpb is the ThinkPad Buttons utility):
         1 - Related to "Volume up" key press
         2 - Related to "Mute on" key press
         3 - Related to "Access IBM" key press
-        4 - Related to "LCD brightness up" key pess
+        4 - Related to "LCD brightness up" key press
         5 - Related to "LCD brightness down" key press
         11 - Related to "toggle screen expansion" key press/function
         12 - Related to "ThinkLight on"
         13 - Related to "ThinkLight off"
-        14 - Related to "ThinkLight" key press (toggle thinklight)
+        14 - Related to "ThinkLight" key press (toggle ThinkLight)
 
 The cmos command interface is prone to firmware split-brain problems, as
 in newer ThinkPads it is just a compatibility layer.  Do not use it, it is
@@ -1024,7 +1037,7 @@ There are two interfaces to the firmware for direct brightness control,
 EC and CMOS.  To select which one should be used, use the
 brightness_mode module parameter: brightness_mode=1 selects EC mode,
 brightness_mode=2 selects CMOS mode, brightness_mode=3 selects both EC
-and CMOS.  The driver tries to autodetect which interface to use.
+and CMOS.  The driver tries to auto-detect which interface to use.
 
 When display backlight brightness controls are available through the
 standard ACPI interface, it is best to use it instead of this direct
@@ -1266,8 +1279,8 @@ experimental=1 parameter when loading the module.
 This feature shows the presence and current state of a W-WAN (Sierra
 Wireless EV-DO) device.
 
-It was tested on a Lenovo Thinkpad X60. It should probably work on other
-Thinkpad models which come with this module installed.
+It was tested on a Lenovo ThinkPad X60. It should probably work on other
+ThinkPad models which come with this module installed.
 
 Procfs notes:
 
@@ -1286,7 +1299,7 @@ Sysfs notes:
                 0: disables WWAN card / WWAN card is disabled
                 1: enables WWAN card / WWAN card is enabled.
 
-        Note: this interface will be probably be superseeded by the
+        Note: this interface will be probably be superseded by the
         generic rfkill class, so it is NOT to be considered stable yet.
 
 Multiple Commands, Module Parameters
@@ -1309,7 +1322,7 @@ Enabling debugging output
 The module takes a debug parameter which can be used to selectively
 enable various classes of debugging output, for example:
 
-         modprobe ibm_acpi debug=0xffff
+         modprobe thinkpad_acpi debug=0xffff
 
 will enable all debugging output classes.  It takes a bitmask, so
 to enable more than one output class, just add their values.
@@ -1356,7 +1369,7 @@ Sysfs interface changelog:
                 NVRAM is compiled out by the user because it is
                 unneeded/undesired in the first place).
 0x020101:       Marker for thinkpad-acpi with hot key NVRAM polling
-                and proper hotkey_mask semanthics (version 8 of the
+                and proper hotkey_mask semantics (version 8 of the
                 NVRAM polling patch).  Some development snapshots of
                 0.18 had an earlier version that did strange things
                 to hotkey_mask.
diff --git a/Documentation/lguest/lguest.c b/Documentation/lguest/lguest.c
index 0f23d67f958f..bec5a32e4095 100644
--- a/Documentation/lguest/lguest.c
+++ b/Documentation/lguest/lguest.c
@@ -486,9 +486,12 @@ static void concat(char *dst, char *args[])
         unsigned int i, len = 0;
 
         for (i = 0; args[i]; i++) {
+                if (i) {
+                        strcat(dst+len, " ");
+                        len++;
+                }
                 strcpy(dst+len, args[i]);
-                strcat(dst+len, " ");
-                len += strlen(args[i]) + 1;
+                len += strlen(args[i]);
         }
         /* In case it's empty. */
         dst[len] = '\0';
diff --git a/Documentation/memory-barriers.txt b/Documentation/memory-barriers.txt
index 4e17beba2379..1f506f7830ec 100644
--- a/Documentation/memory-barriers.txt
+++ b/Documentation/memory-barriers.txt
@@ -1493,7 +1493,7 @@ explicit lock operations, described later).  These include:
         atomic_dec_and_test();
         atomic_sub_and_test();
         atomic_add_negative();
-        atomic_add_unless();
+        atomic_add_unless();    /* when succeeds (returns 1) */
         test_and_set_bit();
         test_and_clear_bit();
         test_and_change_bit();
diff --git a/Documentation/pci.txt b/Documentation/pci.txt
index 72b20c639596..d2c2e6e2b224 100644
--- a/Documentation/pci.txt
+++ b/Documentation/pci.txt
@@ -123,7 +123,8 @@ initialization with a pointer to a structure describing the driver
 
 
 The ID table is an array of struct pci_device_id entries ending with an
-all-zero entry.  Each entry consists of:
+all-zero entry; use of the macro DEFINE_PCI_DEVICE_TABLE is the preferred
+method of declaring the table.  Each entry consists of:
 
         vendor,device   Vendor and device ID to match (or PCI_ANY_ID)
 
@@ -191,7 +192,8 @@ Tips on when/where to use the above attributes:
 
         o Do not mark the struct pci_driver.
 
-        o The ID table array should be marked __devinitdata.
+        o The ID table array should be marked __devinitconst; this is done
+          automatically if the table is declared with DEFINE_PCI_DEVICE_TABLE().
 
         o The probe() and remove() functions should be marked __devinit
           and __devexit respectively.  All initialization functions
diff --git a/Documentation/power/devices.txt b/Documentation/power/devices.txt
index c53d26361919..461e4f1dbec4 100644
--- a/Documentation/power/devices.txt
+++ b/Documentation/power/devices.txt
@@ -310,9 +310,12 @@ used with suspend-to-disk:
     PM_EVENT_SUSPEND -- quiesce the driver and put hardware into a low-power
         state.  When used with system sleep states like "suspend-to-RAM" or
         "standby", the upcoming resume() call will often be able to rely on
-        state kept in hardware, or issue system wakeup events.  When used
-        instead with suspend-to-disk, few devices support this capability;
-        most are completely powered off.
+        state kept in hardware, or issue system wakeup events.
+
+    PM_EVENT_HIBERNATE -- Put hardware into a low-power state and enable wakeup
+        events as appropriate.  It is only used with hibernation
+        (suspend-to-disk) and few devices are able to wake up the system from
+        this state; most are completely powered off.
 
     PM_EVENT_FREEZE -- quiesce the driver, but don't necessarily change into
         any low power mode.  A system snapshot is about to be taken, often
@@ -329,8 +332,8 @@ used with suspend-to-disk:
         wakeup events nor DMA are allowed.
 
 To enter "standby" (ACPI S1) or "Suspend to RAM" (STR, ACPI S3) states, or
-the similarly named APM states, only PM_EVENT_SUSPEND is used; for "Suspend
-to Disk" (STD, hibernate, ACPI S4), all of those event codes are used.
+the similarly named APM states, only PM_EVENT_SUSPEND is used; the other event
+codes are used for hibernation ("Suspend to Disk", STD, ACPI S4).
 
 There's also PM_EVENT_ON, a value which never appears as a suspend event
 but is sometimes used to record the "not suspended" device state.
diff --git a/Documentation/scheduler/sched-stats.txt b/Documentation/scheduler/sched-stats.txt
index 442e14d35dea..01e69404ee5e 100644
--- a/Documentation/scheduler/sched-stats.txt
+++ b/Documentation/scheduler/sched-stats.txt
@@ -142,7 +142,7 @@ of idleness (idle, busy, and newly idle):
 
 /proc/<pid>/schedstat
 ----------------
-schedstats also adds a new /proc/<pid/schedstat file to include some of
+schedstats also adds a new /proc/<pid>/schedstat file to include some of
 the same information on a per-process level.  There are three fields in
 this file correlating for that process to:
      1) time spent on the cpu
diff --git a/Documentation/scsi/ChangeLog.arcmsr b/Documentation/scsi/ChangeLog.arcmsr
index de2bcacfa870..038a3e6ecaa4 100644
--- a/Documentation/scsi/ChangeLog.arcmsr
+++ b/Documentation/scsi/ChangeLog.arcmsr
@@ -109,4 +109,10 @@
 **                                              8.replace pci_alloc_consistent()/pci_free_consistent() with kmalloc()/kfree() in arcmsr_iop_message_xfer()
 **                                              9. fix the release of dma memory for type B in arcmsr_free_ccb_pool()
 **                                              10.fix the arcmsr_polling_hbb_ccbdone()
+** 1.20.00.15   02/27/2008      Erich Chen & Nick Cheng
+**                                              1.arcmsr_iop_message_xfer() is called from atomic context under the
+**                                              queuecommand scsi_host_template handler. James Bottomley pointed out
+**                                              that the current GFP_KERNEL|GFP_DMA flags are wrong: firstly we are in
+**                                              atomic context, secondly this memory is not used for DMA.
+**                                              Also removed some unneeded casts. Thanks to Daniel Drake <dsd@gentoo.org>
 **************************************************************************
diff --git a/Documentation/stable_kernel_rules.txt b/Documentation/stable_kernel_rules.txt
index c815c5206e84..4cfc78835bc1 100644
--- a/Documentation/stable_kernel_rules.txt
+++ b/Documentation/stable_kernel_rules.txt
@@ -16,8 +16,9 @@ Rules on what kind of patches are accepted, and which ones are not, into the
    race can be exploited is also provided.
  - It cannot contain any "trivial" fixes in it (spelling changes,
    whitespace cleanups, etc).
- - It must be accepted by the relevant subsystem maintainer.
  - It must follow the Documentation/SubmittingPatches rules.
+ - It or an equivalent fix must already exist in Linus' tree.  Quote the
+   respective commit ID in Linus' tree in your patch submission to -stable.
 
 
 Procedure for submitting patches to the -stable tree:
@@ -28,7 +29,9 @@ Procedure for submitting patches to the -stable tree:
    queue, or a NAK if the patch is rejected.  This response might take a few
    days, according to the developer's schedules.
  - If accepted, the patch will be added to the -stable queue, for review by
-   other developers.
+   other developers and by the relevant subsystem maintainer.
+ - If the stable@kernel.org address is added to a patch, when it goes into
+   Linus's tree it will automatically be emailed to the stable team.
  - Security patches should not be sent to this alias, but instead to the
    documented security@kernel.org address.
 
diff --git a/Documentation/thermal/sysfs-api.txt b/Documentation/thermal/sysfs-api.txt
index ba9c2da5a8c2..d9f28be75403 100644
--- a/Documentation/thermal/sysfs-api.txt
+++ b/Documentation/thermal/sysfs-api.txt
@@ -143,10 +143,10 @@ type				Strings which represent the thermal zone type.
                                 This is given by thermal zone driver as part of registration.
                                 Eg: "ACPI thermal zone" indicates it's a ACPI thermal device
                                 RO
-                                Optional
+                                Required
 
 temp                            Current temperature as reported by thermal zone (sensor)
-                                Unit: degree Celsius
+                                Unit: millidegree Celsius
                                 RO
                                 Required
 
@@ -163,7 +163,7 @@ mode				One of the predefined values in [kernel, user]
                                           charge of the thermal management.
 
 trip_point_[0-*]_temp           The temperature above which trip point will be fired
-                                Unit: degree Celsius
+                                Unit: millidegree Celsius
                                 RO
                                 Optional
 
@@ -193,7 +193,7 @@ type				String which represents the type of device
                                 eg. For memory controller device on intel_menlow platform:
                                 this should be "Memory controller"
                                 RO
-                                Optional
+                                Required
 
 max_state                       The maximum permissible cooling state of this cooling device.
                                 RO
@@ -219,16 +219,16 @@ the sys I/F structure will be built like this:
 
 |thermal_zone1:
         |-----type:                     ACPI thermal zone
-        |-----temp:                     37
+        |-----temp:                     37000
         |-----mode:                     kernel
-        |-----trip_point_0_temp:        100
+        |-----trip_point_0_temp:        100000
         |-----trip_point_0_type:        critical
-        |-----trip_point_1_temp:        80
+        |-----trip_point_1_temp:        80000
         |-----trip_point_1_type:        passive
-        |-----trip_point_2_temp:        70
-        |-----trip_point_2_type:        active[0]
-        |-----trip_point_3_temp:        60
-        |-----trip_point_3_type:        active[1]
+        |-----trip_point_2_temp:        70000
+        |-----trip_point_2_type:        active0
+        |-----trip_point_3_temp:        60000
+        |-----trip_point_3_type:        active1
         |-----cdev0:                    --->/sys/class/thermal/cooling_device0
         |-----cdev0_trip_point:         1       /* cdev0 can be used for passive */
         |-----cdev1:                    --->/sys/class/thermal/cooling_device3
diff --git a/Documentation/usb/usb-help.txt b/Documentation/usb/usb-help.txt
index a7408593829f..4273ca2b86ba 100644
--- a/Documentation/usb/usb-help.txt
+++ b/Documentation/usb/usb-help.txt
@@ -1,5 +1,5 @@
 usb-help.txt
-2000-July-12
+2008-Mar-7
 
 For USB help other than the readme files that are located in
 Documentation/usb/*, see the following:
@@ -10,9 +10,7 @@ Linux-USB project:  http://www.linux-usb.org
 Linux USB Guide:    http://linux-usb.sourceforge.net
 Linux-USB device overview (working devices and drivers):
                     http://www.qbik.ch/usb/devices/
-    
-The Linux-USB mailing lists are:
-  linux-usb-users@lists.sourceforge.net   for general user help
-  linux-usb-devel@lists.sourceforge.net   for developer discussions
+
+The Linux-USB mailing list is at linux-usb@vger.kernel.org
 
 ###
diff --git a/Documentation/vm/slabinfo.c b/Documentation/vm/slabinfo.c
index 7123fee708ca..22d7e3e4d60c 100644
--- a/Documentation/vm/slabinfo.c
+++ b/Documentation/vm/slabinfo.c
@@ -1123,7 +1123,7 @@ void read_slab_dir(void)
         char *t;
         int count;
 
-        if (chdir("/sys/kernel/slab"))
+        if (chdir("/sys/kernel/slab") && chdir("/sys/slab"))
                 fatal("SYSFS support for SLUB not active\n");
 
         dir = opendir(".");
diff --git a/Documentation/vm/slub.txt b/Documentation/vm/slub.txt
index dcf8bcf846d6..7c13f22a0c9e 100644
--- a/Documentation/vm/slub.txt
+++ b/Documentation/vm/slub.txt
@@ -50,14 +50,14 @@ F.e. in order to boot just with sanity checks and red zoning one would specify:
 
 Trying to find an issue in the dentry cache? Try
 
-        slub_debug=,dentry_cache
+        slub_debug=,dentry
 
 to only enable debugging on the dentry cache.
 
 Red zoning and tracking may realign the slab.  We can just apply sanity checks
 to the dentry cache with
 
-        slub_debug=F,dentry_cache
+        slub_debug=F,dentry
 
 In case you forgot to enable debugging on the kernel command line: It is
 possible to enable debugging manually when the kernel is up. Look at the