Merge commit 'v2.6.27-rc6' into core/rcu

45 files changed, 498 insertions, 190 deletions

diff --git a/Documentation/ABI/testing/sysfs-firmware-sgi_uv b/Documentation/ABI/testing/sysfs-firmware-sgi_uv
new file mode 100644
index 000000000000..4573fd4b7876
--- /dev/null
+++ b/Documentation/ABI/testing/sysfs-firmware-sgi_uv
@@ -0,0 +1,27 @@
+What:           /sys/firmware/sgi_uv/
+Date:           August 2008
+Contact:        Russ Anderson <rja@sgi.com>
+Description:
+                The /sys/firmware/sgi_uv directory contains information
+                about the SGI UV platform.
+
+                Under that directory are a number of files:
+
+                        partition_id
+                        coherence_id
+
+                The partition_id entry contains the partition id.
+                SGI UV systems can be partitioned into multiple physical
+                machines, which each partition running a unique copy
+                of the operating system.  Each partition will have a unique
+                partition id.  To display the partition id, use the command:
+
+                        cat /sys/firmware/sgi_uv/partition_id
+
+                The coherence_id entry contains the coherence id.
+                A partitioned SGI UV system can have one or more coherence
+                domain.  The coherence id indicates which coherence domain
+                this partition is in.  To display the coherence id, use the
+                command:
+
+                        cat /sys/firmware/sgi_uv/coherence_id
diff --git a/Documentation/DocBook/Makefile b/Documentation/DocBook/Makefile
index 1d1b34500b69..1615350b7b53 100644
--- a/Documentation/DocBook/Makefile
+++ b/Documentation/DocBook/Makefile
@@ -102,6 +102,13 @@ C-procfs-example = procfs_example.xml
 C-procfs-example2 = $(addprefix $(obj)/,$(C-procfs-example))
 $(obj)/procfs-guide.xml: $(C-procfs-example2)
 
+# List of programs to build
+##oops, this is a kernel module::hostprogs-y := procfs_example
+obj-m += procfs_example.o
+
+# Tell kbuild to always build the programs
+always := $(hostprogs-y)
+
 notfoundtemplate = echo "*** You have to install docbook-utils or xmlto ***"; \
                    exit 1
 db2xtemplate = db2TYPE -o $(dir $@) $<
diff --git a/Documentation/DocBook/procfs_example.c b/Documentation/DocBook/procfs_example.c
index 7064084c1c5e..2f3de0fb8365 100644
--- a/Documentation/DocBook/procfs_example.c
+++ b/Documentation/DocBook/procfs_example.c
@@ -189,8 +189,6 @@ static int __init init_procfs_example(void)
         return 0;
 
 no_symlink:
-        remove_proc_entry("tty", example_dir);
-no_tty:
         remove_proc_entry("bar", example_dir);
 no_bar:
         remove_proc_entry("foo", example_dir);
@@ -206,7 +204,6 @@ out:
 static void __exit cleanup_procfs_example(void)
 {
         remove_proc_entry("jiffies_too", example_dir);
-        remove_proc_entry("tty", example_dir);
         remove_proc_entry("bar", example_dir);
         remove_proc_entry("foo", example_dir);
         remove_proc_entry("jiffies", example_dir);
@@ -222,3 +219,4 @@ module_exit(cleanup_procfs_example);
 
 MODULE_AUTHOR("Erik Mouw");
 MODULE_DESCRIPTION("procfs examples");
+MODULE_LICENSE("GPL");
diff --git a/Documentation/Makefile b/Documentation/Makefile
new file mode 100644
index 000000000000..94b945733534
--- /dev/null
+++ b/Documentation/Makefile
@@ -0,0 +1,3 @@
+obj-m := DocBook/ accounting/ auxdisplay/ connector/ \
+        filesystems/configfs/ ia64/ networking/ \
+        pcmcia/ spi/ video4linux/ vm/ watchdog/src/
diff --git a/Documentation/accounting/Makefile b/Documentation/accounting/Makefile
new file mode 100644
index 000000000000..31929eb875b1
--- /dev/null
+++ b/Documentation/accounting/Makefile
@@ -0,0 +1,10 @@
+# kbuild trick to avoid linker error. Can be omitted if a module is built.
+obj- := dummy.o
+
+# List of programs to build
+hostprogs-y := getdelays
+
+# Tell kbuild to always build the programs
+always := $(hostprogs-y)
+
+HOSTCFLAGS_getdelays.o += -I$(objtree)/usr/include
diff --git a/Documentation/accounting/getdelays.c b/Documentation/accounting/getdelays.c
index 3f7755f3963f..cc49400b4af8 100644
--- a/Documentation/accounting/getdelays.c
+++ b/Documentation/accounting/getdelays.c
@@ -201,13 +201,19 @@ void print_delayacct(struct taskstats *t)
                "RECLAIM  %12s%15s\n"
                "      %15llu%15llu\n",
                "count", "real total", "virtual total", "delay total",
-               t->cpu_count, t->cpu_run_real_total, t->cpu_run_virtual_total,
-               t->cpu_delay_total,
+               (unsigned long long)t->cpu_count,
+               (unsigned long long)t->cpu_run_real_total,
+               (unsigned long long)t->cpu_run_virtual_total,
+               (unsigned long long)t->cpu_delay_total,
                "count", "delay total",
-               t->blkio_count, t->blkio_delay_total,
-               "count", "delay total", t->swapin_count, t->swapin_delay_total,
+               (unsigned long long)t->blkio_count,
+               (unsigned long long)t->blkio_delay_total,
                "count", "delay total",
-               t->freepages_count, t->freepages_delay_total);
+               (unsigned long long)t->swapin_count,
+               (unsigned long long)t->swapin_delay_total,
+               "count", "delay total",
+               (unsigned long long)t->freepages_count,
+               (unsigned long long)t->freepages_delay_total);
 }
 
 void task_context_switch_counts(struct taskstats *t)
@@ -215,14 +221,17 @@ void task_context_switch_counts(struct taskstats *t)
         printf("\n\nTask   %15s%15s\n"
                "       %15llu%15llu\n",
                "voluntary", "nonvoluntary",
-               t->nvcsw, t->nivcsw);
+               (unsigned long long)t->nvcsw, (unsigned long long)t->nivcsw);
 }
 
 void print_cgroupstats(struct cgroupstats *c)
 {
         printf("sleeping %llu, blocked %llu, running %llu, stopped %llu, "
-                "uninterruptible %llu\n", c->nr_sleeping, c->nr_io_wait,
-                c->nr_running, c->nr_stopped, c->nr_uninterruptible);
+                "uninterruptible %llu\n", (unsigned long long)c->nr_sleeping,
+                (unsigned long long)c->nr_io_wait,
+                (unsigned long long)c->nr_running,
+                (unsigned long long)c->nr_stopped,
+                (unsigned long long)c->nr_uninterruptible);
 }
 
 
diff --git a/Documentation/arm/Samsung-S3C24XX/GPIO.txt b/Documentation/arm/Samsung-S3C24XX/GPIO.txt
index b5d20c0b2ab4..ea7ccfc4b274 100644
--- a/Documentation/arm/Samsung-S3C24XX/GPIO.txt
+++ b/Documentation/arm/Samsung-S3C24XX/GPIO.txt
@@ -13,6 +13,21 @@ Introduction
   data-sheet/users manual to find out the complete list.
 
 
+GPIOLIB
+-------
+
+  With the event of the GPIOLIB in drivers/gpio, support for some
+  of the GPIO functions such as reading and writing a pin will
+  be removed in favour of this common access method.
+
+  Once all the extant drivers have been converted, the functions
+  listed below will be removed (they may be marked as __deprecated
+  in the near future).
+
+  - s3c2410_gpio_getpin
+  - s3c2410_gpio_setpin
+
+
 Headers
 -------
 
diff --git a/Documentation/arm/Samsung-S3C24XX/Overview.txt b/Documentation/arm/Samsung-S3C24XX/Overview.txt
index 014a8ec4877d..cff6227b4484 100644
--- a/Documentation/arm/Samsung-S3C24XX/Overview.txt
+++ b/Documentation/arm/Samsung-S3C24XX/Overview.txt
@@ -8,9 +8,10 @@ Introduction
 
   The Samsung S3C24XX range of ARM9 System-on-Chip CPUs are supported
   by the 's3c2410' architecture of ARM Linux. Currently the S3C2410,
-  S3C2412, S3C2413, S3C2440 and S3C2442 devices are supported.
+  S3C2412, S3C2413, S3C2440, S3C2442 and S3C2443 devices are supported.
+
+  Support for the S3C2400 and S3C24A0 series are in progress.
 
-  Support for the S3C2400 series is in progress.
 
 Configuration
 -------------
@@ -38,6 +39,22 @@ Layout
   Register, kernel and platform data definitions are held in the
   arch/arm/mach-s3c2410 directory./include/mach
 
+arch/arm/plat-s3c24xx:
+
+  Files in here are either common to all the s3c24xx family,
+  or are common to only some of them with names to indicate this
+  status. The files that are not common to all are generally named
+  with the initial cpu they support in the series to ensure a short
+  name without any possibility of confusion with newer devices.
+
+  As an example, initially s3c244x would cover s3c2440 and s3c2442, but
+  with the s3c2443 which does not share many of the same drivers in
+  this directory, the name becomes invalid. We stick to s3c2440-<x>
+  to indicate a driver that is s3c2440 and s3c2442 compatible.
+
+  This does mean that to find the status of any given SoC, a number
+  of directories may need to be searched.
+
 
 Machines
 --------
@@ -159,6 +176,17 @@ NAND
   For more information see Documentation/arm/Samsung-S3C24XX/NAND.txt
 
 
+SD/MMC
+------
+
+  The SD/MMC hardware pre S3C2443 is supported in the current
+  kernel, the driver is drivers/mmc/host/s3cmci.c and supports
+  1 and 4 bit SD or MMC cards.
+
+  The SDIO behaviour of this driver has not been fully tested. There is no
+  current support for hardware SDIO interrupts.
+
+
 Serial
 ------
 
@@ -178,6 +206,9 @@ GPIO
   The core contains support for manipulating the GPIO, see the
   documentation in GPIO.txt in the same directory as this file.
 
+  Newer kernels carry GPIOLIB, and support is being moved towards
+  this with some of the older support in line to be removed.
+
 
 Clock Management
 ----------------
diff --git a/Documentation/auxdisplay/Makefile b/Documentation/auxdisplay/Makefile
new file mode 100644
index 000000000000..51fe23332c81
--- /dev/null
+++ b/Documentation/auxdisplay/Makefile
@@ -0,0 +1,10 @@
+# kbuild trick to avoid linker error. Can be omitted if a module is built.
+obj- := dummy.o
+
+# List of programs to build
+hostprogs-y := cfag12864b-example
+
+# Tell kbuild to always build the programs
+always := $(hostprogs-y)
+
+HOSTCFLAGS_cfag12864b-example.o += -I$(objtree)/usr/include
diff --git a/Documentation/connector/Makefile b/Documentation/connector/Makefile
new file mode 100644
index 000000000000..8df1a7285a06
--- /dev/null
+++ b/Documentation/connector/Makefile
@@ -0,0 +1,11 @@
+ifneq ($(CONFIG_CONNECTOR),)
+obj-m += cn_test.o
+endif
+
+# List of programs to build
+hostprogs-y := ucon
+
+# Tell kbuild to always build the programs
+always := $(hostprogs-y)
+
+HOSTCFLAGS_ucon.o += -I$(objtree)/usr/include
diff --git a/Documentation/cpu-hotplug.txt b/Documentation/cpu-hotplug.txt
index ba0aacde94fb..94bbc27ddd4f 100644
--- a/Documentation/cpu-hotplug.txt
+++ b/Documentation/cpu-hotplug.txt
@@ -59,15 +59,10 @@ apicid values in those tables for disabled apics. In the event BIOS doesn't
 mark such hot-pluggable cpus as disabled entries, one could use this
 parameter "additional_cpus=x" to represent those cpus in the cpu_possible_map.
 
-s390 uses the number of cpus it detects at IPL time to also the number of bits
-in cpu_possible_map. If it is desired to add additional cpus at a later time
-the number should be specified using this option or the possible_cpus option.
-
 possible_cpus=n         [s390 only] use this to set hotpluggable cpus.
                         This option sets possible_cpus bits in
                         cpu_possible_map. Thus keeping the numbers of bits set
                         constant even if the machine gets rebooted.
-                        This option overrides additional_cpus.
 
 CPU maps and such
 -----------------
diff --git a/Documentation/devices.txt b/Documentation/devices.txt
index e6244cde26e9..05c80645e4ee 100644
--- a/Documentation/devices.txt
+++ b/Documentation/devices.txt
@@ -2560,9 +2560,6 @@ Your cooperation is appreciated.
                  96 = /dev/usb/hiddev0  1st USB HID device
                     ...
                 111 = /dev/usb/hiddev15 16th USB HID device
-                112 = /dev/usb/auer0    1st auerswald ISDN device
-                    ...
-                127 = /dev/usb/auer15   16th auerswald ISDN device
                 128 = /dev/usb/brlvgr0  First Braille Voyager device
                     ...
                 131 = /dev/usb/brlvgr3  Fourth Braille Voyager device
diff --git a/Documentation/dontdiff b/Documentation/dontdiff
index 881e6dd03aea..27809357da58 100644
--- a/Documentation/dontdiff
+++ b/Documentation/dontdiff
@@ -5,6 +5,8 @@
 *.css
 *.dvi
 *.eps
+*.fw.gen.S
+*.fw
 *.gif
 *.grep
 *.grp
diff --git a/Documentation/feature-removal-schedule.txt b/Documentation/feature-removal-schedule.txt
index c23955404bf5..eb1a47b97427 100644
--- a/Documentation/feature-removal-schedule.txt
+++ b/Documentation/feature-removal-schedule.txt
@@ -19,15 +19,6 @@ Who:	Pavel Machek <pavel@suse.cz>
 
 ---------------------------
 
-What:   old NCR53C9x driver
-When:   October 2007
-Why:    Replaced by the much better esp_scsi driver.  Actual low-level
-        driver can be ported over almost trivially.
-Who:    David Miller <davem@davemloft.net>
-        Christoph Hellwig <hch@lst.de>
-
----------------------------
-
 What:   Video4Linux API 1 ioctls and video_decoder.h from Video devices.
 When:   December 2008
 Files:  include/linux/video_decoder.h include/linux/videodev.h
@@ -205,19 +196,6 @@ Who:  Tejun Heo <htejun@gmail.com>
 
 ---------------------------
 
-What: The arch/ppc and include/asm-ppc directories
-When: Jun 2008
-Why:  The arch/powerpc tree is the merged architecture for ppc32 and ppc64
-      platforms.  Currently there are efforts underway to port the remaining
-      arch/ppc platforms to the merged tree.  New submissions to the arch/ppc
-      tree have been frozen with the 2.6.22 kernel release and that tree will
-      remain in bug-fix only mode until its scheduled removal.  Platforms
-      that are not ported by June 2008 will be removed due to the lack of an
-      interested maintainer.
-Who:  linuxppc-dev@ozlabs.org
-
----------------------------
-
 What:   i386/x86_64 bzImage symlinks
 When:   April 2010
 
diff --git a/Documentation/filesystems/Locking b/Documentation/filesystems/Locking
index 680fb566b928..8362860e21a7 100644
--- a/Documentation/filesystems/Locking
+++ b/Documentation/filesystems/Locking
@@ -144,8 +144,8 @@ prototypes:
         void (*kill_sb) (struct super_block *);
 locking rules:
                 may block       BKL
-get_sb          yes             yes
-kill_sb         yes             yes
+get_sb          yes             no
+kill_sb         yes             no
 
 ->get_sb() returns error or 0 with locked superblock attached to the vfsmount
 (exclusive on ->s_umount).
@@ -409,12 +409,12 @@ ioctl:			yes	(see below)
 unlocked_ioctl:         no      (see below)
 compat_ioctl:           no
 mmap:                   no
-open:                   maybe   (see below)
+open:                   no
 flush:                  no
 release:                no
 fsync:                  no      (see below)
 aio_fsync:              no
-fasync:                 yes     (see below)
+fasync:                 no
 lock:                   yes
 readv:                  no
 writev:                 no
@@ -431,13 +431,6 @@ For many filesystems, it is probably safe to acquire the inode
 semaphore.  Note some filesystems (i.e. remote ones) provide no
 protection for i_size so you will need to use the BKL.
 
-->open() locking is in-transit: big lock partially moved into the methods.
-The only exception is ->open() in the instances of file_operations that never
-end up in ->i_fop/->proc_fops, i.e. ones that belong to character devices
-(chrdev_open() takes lock before replacing ->f_op and calling the secondary
-method. As soon as we fix the handling of module reference counters all
-instances of ->open() will be called without the BKL.
-
 Note: ext2_release() was *the* source of contention on fs-intensive
 loads and dropping BKL on ->release() helps to get rid of that (we still
 grab BKL for cases when we close a file that had been opened r/w, but that
diff --git a/Documentation/filesystems/configfs/Makefile b/Documentation/filesystems/configfs/Makefile
new file mode 100644
index 000000000000..be7ec5e67dbc
--- /dev/null
+++ b/Documentation/filesystems/configfs/Makefile
@@ -0,0 +1,3 @@
+ifneq ($(CONFIG_CONFIGFS_FS),)
+obj-m += configfs_example_explicit.o configfs_example_macros.o
+endif
diff --git a/Documentation/filesystems/ext4.txt b/Documentation/filesystems/ext4.txt
index 80e193d82e2e..0d5394920a31 100644
--- a/Documentation/filesystems/ext4.txt
+++ b/Documentation/filesystems/ext4.txt
@@ -26,6 +26,12 @@ Mailing list: linux-ext4@vger.kernel.org
 
     git://git.kernel.org/pub/scm/fs/ext2/e2fsprogs.git
 
+  - Note that it is highly important to install the mke2fs.conf file
+    that comes with the e2fsprogs 1.41.x sources in /etc/mke2fs.conf. If
+    you have edited the /etc/mke2fs.conf file installed on your system,
+    you will need to merge your changes with the version from e2fsprogs
+    1.41.x.
+
   - Create a new filesystem using the ext4dev filesystem type:
 
         # mke2fs -t ext4dev /dev/hda1
diff --git a/Documentation/filesystems/ntfs.txt b/Documentation/filesystems/ntfs.txt
index e79ee2db183a..ac2a261c5f7d 100644
--- a/Documentation/filesystems/ntfs.txt
+++ b/Documentation/filesystems/ntfs.txt
@@ -40,7 +40,7 @@ Web site
 ========
 
 There is plenty of additional information on the linux-ntfs web site
-at http://linux-ntfs.sourceforge.net/
+at http://www.linux-ntfs.org/
 
 The web site has a lot of additional information, such as a comprehensive
 FAQ, documentation on the NTFS on-disk format, information on the Linux-NTFS
@@ -272,7 +272,7 @@ And you would know that /dev/hda2 has a size of 37768814 - 4209030 + 1 =
 For Win2k and later dynamic disks, you can for example use the ldminfo utility
 which is part of the Linux LDM tools (the latest version at the time of
 writing is linux-ldm-0.0.8.tar.bz2).  You can download it from:
-        http://linux-ntfs.sourceforge.net/downloads.html
+        http://www.linux-ntfs.org/
 Simply extract the downloaded archive (tar xvjf linux-ldm-0.0.8.tar.bz2), go
 into it (cd linux-ldm-0.0.8) and change to the test directory (cd test).  You
 will find the precompiled (i386) ldminfo utility there.  NOTE: You will not be
diff --git a/Documentation/filesystems/proc.txt b/Documentation/filesystems/proc.txt
index 64557821ee59..394eb2cc1c39 100644
--- a/Documentation/filesystems/proc.txt
+++ b/Documentation/filesystems/proc.txt
@@ -1339,6 +1339,25 @@ Enables/Disables the protection of the per-process proc entries "maps" and
 "smaps".  When enabled, the contents of these files are visible only to
 readers that are allowed to ptrace() the given process.
 
+msgmni
+------
+
+Maximum number of message queue ids on the system.
+This value scales to the amount of lowmem. It is automatically recomputed
+upon memory add/remove or ipc namespace creation/removal.
+When a value is written into this file, msgmni's value becomes fixed, i.e. it
+is not recomputed anymore when one of the above events occurs.
+Use auto_msgmni to change this behavior.
+
+auto_msgmni
+-----------
+
+Enables/Disables automatic recomputing of msgmni upon memory add/remove or
+upon ipc namespace creation/removal (see the msgmni description above).
+Echoing "1" into this file enables msgmni automatic recomputing.
+Echoing "0" turns it off.
+auto_msgmni default value is 1.
+
 
 2.4 /proc/sys/vm - The virtual memory subsystem
 -----------------------------------------------
diff --git a/Documentation/filesystems/quota.txt b/Documentation/filesystems/quota.txt
index a590c4093eff..5e8de25bf0f1 100644
--- a/Documentation/filesystems/quota.txt
+++ b/Documentation/filesystems/quota.txt
@@ -3,14 +3,14 @@ Quota subsystem
 ===============
 
 Quota subsystem allows system administrator to set limits on used space and
-number of used inodes (inode is a filesystem structure which is associated
-with each file or directory) for users and/or groups. For both used space and
-number of used inodes there are actually two limits. The first one is called
-softlimit and the second one hardlimit.  An user can never exceed a hardlimit
-for any resource. User is allowed to exceed softlimit but only for limited
-period of time. This period is called "grace period" or "grace time". When
-grace time is over, user is not able to allocate more space/inodes until he
-frees enough of them to get below softlimit.
+number of used inodes (inode is a filesystem structure which is associated with
+each file or directory) for users and/or groups. For both used space and number
+of used inodes there are actually two limits. The first one is called softlimit
+and the second one hardlimit.  An user can never exceed a hardlimit for any
+resource (unless he has CAP_SYS_RESOURCE capability). User is allowed to exceed
+softlimit but only for limited period of time. This period is called "grace
+period" or "grace time". When grace time is over, user is not able to allocate
+more space/inodes until he frees enough of them to get below softlimit.
 
 Quota limits (and amount of grace time) are set independently for each
 filesystem.
@@ -53,6 +53,12 @@ in parentheses):
                 QUOTA_NL_BSOFTLONGWARN - space (block) softlimit is exceeded
                   longer than given grace period.
                 QUOTA_NL_BSOFTWARN - space (block) softlimit
+          - four warnings are also defined for the event when user stops
+            exceeding some limit:
+                QUOTA_NL_IHARDBELOW - inode hardlimit
+                QUOTA_NL_ISOFTBELOW - inode softlimit
+                QUOTA_NL_BHARDBELOW - space (block) hardlimit
+                QUOTA_NL_BSOFTBELOW - space (block) softlimit
         QUOTA_NL_A_DEV_MAJOR (u32)
           - major number of a device with the affected filesystem
         QUOTA_NL_A_DEV_MINOR (u32)
diff --git a/Documentation/filesystems/ubifs.txt b/Documentation/filesystems/ubifs.txt
index 540e9e7f59c5..6a0d70a22f05 100644
--- a/Documentation/filesystems/ubifs.txt
+++ b/Documentation/filesystems/ubifs.txt
@@ -57,7 +57,7 @@ Similarly to JFFS2, UBIFS supports on-the-flight compression which makes
 it possible to fit quite a lot of data to the flash.
 
 Similarly to JFFS2, UBIFS is tolerant of unclean reboots and power-cuts.
-It does not need stuff like ckfs.ext2. UBIFS automatically replays its
+It does not need stuff like fsck.ext2. UBIFS automatically replays its
 journal and recovers from crashes, ensuring that the on-flash data
 structures are consistent.
 
diff --git a/Documentation/hwmon/ibmaem b/Documentation/hwmon/ibmaem
index 2fefaf582a43..e98bdfea3467 100644
--- a/Documentation/hwmon/ibmaem
+++ b/Documentation/hwmon/ibmaem
@@ -1,8 +1,11 @@
 Kernel driver ibmaem
 ======================
 
+This driver talks to the IBM Systems Director Active Energy Manager, known
+henceforth as AEM.
+
 Supported systems:
-  * Any recent IBM System X server with Active Energy Manager support.
+  * Any recent IBM System X server with AEM support.
     This includes the x3350, x3550, x3650, x3655, x3755, x3850 M2,
     x3950 M2, and certain HS2x/LS2x/QS2x blades.  The IPMI host interface
     driver ("ipmi-si") needs to be loaded for this driver to do anything.
@@ -14,24 +17,22 @@ Author: Darrick J. Wong
 Description
 -----------
 
-This driver implements sensor reading support for the energy and power
-meters available on various IBM System X hardware through the BMC.  All
-sensor banks will be exported as platform devices; this driver can talk
-to both v1 and v2 interfaces.  This driver is completely separate from the
-older ibmpex driver.
+This driver implements sensor reading support for the energy and power meters
+available on various IBM System X hardware through the BMC.  All sensor banks
+will be exported as platform devices; this driver can talk to both v1 and v2
+interfaces.  This driver is completely separate from the older ibmpex driver.
 
-The v1 AEM interface has a simple set of features to monitor energy use.
-There is a register that displays an estimate of raw energy consumption
-since the last BMC reset, and a power sensor that returns average power
-use over a configurable interval.
+The v1 AEM interface has a simple set of features to monitor energy use.  There
+is a register that displays an estimate of raw energy consumption since the
+last BMC reset, and a power sensor that returns average power use over a
+configurable interval.
 
-The v2 AEM interface is a bit more sophisticated, being able to present
-a wider range of energy and power use registers, the power cap as
-set by the AEM software, and temperature sensors.
+The v2 AEM interface is a bit more sophisticated, being able to present a wider
+range of energy and power use registers, the power cap as set by the AEM
+software, and temperature sensors.
 
 Special Features
 ----------------
 
-The "power_cap" value displays the current system power cap, as set by
-the Active Energy Manager software.  Setting the power cap from the host
-is not currently supported.
+The "power_cap" value displays the current system power cap, as set by the AEM
+software.  Setting the power cap from the host is not currently supported.
diff --git a/Documentation/ia64/Makefile b/Documentation/ia64/Makefile
new file mode 100644
index 000000000000..b75db69ec483
--- /dev/null
+++ b/Documentation/ia64/Makefile
@@ -0,0 +1,8 @@
+# kbuild trick to avoid linker error. Can be omitted if a module is built.
+obj- := dummy.o
+
+# List of programs to build
+hostprogs-y := aliasing-test
+
+# Tell kbuild to always build the programs
+always := $(hostprogs-y)
diff --git a/Documentation/ioctl-number.txt b/Documentation/ioctl-number.txt
index 3bb5f466a90d..1c6b545635a2 100644
--- a/Documentation/ioctl-number.txt
+++ b/Documentation/ioctl-number.txt
@@ -105,7 +105,6 @@ Code	Seq#	Include File		Comments
 'T'     all     linux/soundcard.h       conflict!
 'T'     all     asm-i386/ioctls.h       conflict!
 'U'     00-EF   linux/drivers/usb/usb.h
-'U'     F0-FF   drivers/usb/auerswald.c
 'V'     all     linux/vt.h
 'W'     00-1F   linux/watchdog.h        conflict!
 'W'     00-1F   linux/wanrouter.h       conflict!
diff --git a/Documentation/ja_JP/HOWTO b/Documentation/ja_JP/HOWTO
index 488c77fa3aae..0775cf4798b2 100644
--- a/Documentation/ja_JP/HOWTO
+++ b/Documentation/ja_JP/HOWTO
@@ -11,14 +11,14 @@ for non English (read: Japanese) speakers and is not intended as a
 fork. So if you have any comments or updates for this file, please try
 to update the original English file first.
 
-Last Updated: 2007/11/16
+Last Updated: 2008/08/21
 ==================================
 �れ��
-linux-2.6.24/Documentation/HOWTO
+linux-2.6.27/Documentation/HOWTO
 �和訳��。
 
 翻訳団体： JF プロジェクト < http://www.linux.or.jp/JF/ >
-翻訳日： 2007/11/10
+翻訳日： 2008/8/5
 翻訳者： Tsugikazu Shibata <tshibata at ab dot jp dot nec dot com>
 校正者： �倉�ん <nbh--mats at nifty dot com>
          �林 雅典�ん (Masanori Kobayasi) <zap03216 at nifty dot ne dot jp>
@@ -287,13 +287,15 @@ Linux カーãƒ�ルã�®é–‹ç™ºãƒ—ロセスã�¯ç�¾åœ¨å¹¾ã�¤ã�‹ã�®ç•°ã�ªã‚‹ãƒ¡ã‚¤ãƒ³ã‚
     �安定��状態��る�判断�����リリース�れ��。目標�毎週新
     �� -rc カー�ルをリリース�る����。
 
-   - 以下� URL �� -rc リリース�存在�る既知�後戻り�題�リスト
-     �追跡�れ��-
-     http://kernelnewbies.org/known_regressions
-
   - ��プロセス�カー�ル� 「準備������考�られる��継続��
     �。��プロセス����� 6週間継続���。
 
+  - �リリース��既知�後戻り�題(regression: ��リリース�中�新�
+    �作り込�れ��題を指�) ���都度 Linux-kernel メーリングリスト
+    �投稿�れ��。ゴール�����カー�ル� 「準備������宣言
+    �る����リスト�長�をゼロ�減ら��������実���数個�
+    後戻り�題�リリース時�����残�������。
+
 Andrew Morton � Linux-kernel メーリングリスト�カー�ルリリース���
 �書����を���言�������価値��り��-
   「カー�ル���リリース�れる��誰も知り��ん。���ら��れ��
@@ -303,18 +305,20 @@ Andrew Morton ã�Œ Linux-kernel メーリングリストã�«ã‚«ãƒ¼ãƒ�ルリリーã
 2.6.x.y -stable カー�ルツリー
 ---------------------------
 
-�ージョン�4�目�数字����カー�ル� -stable カー�ル��。�れ�
-��2.6.x カー�ル�見����セキュリティ�題や�大�後戻り�対�る比
-較的������修正���れ��。
+�ージョン番��4��数字�分�れ��るカー�ル� -stable カー�ル��。
+�れ���2.6.x カー�ル�見����セキュリティ�題や�大�後戻り�対
+�る比較的������修正���れ��。
 
 �れ��開発/実験的�ージョン�テスト��力�る���興味�無��
 最新�安定��カー�ルを使���ユーザ�推奨�るブラン���。
 
-も��2.6.x.y カー�ル�存在���場����番��一番大�� 2.6.x
-�最新�安定版カー�ル��。
+も��2.6.x.y カー�ル�存在���場����番��一番大�� 2.6.x �
+最新�安定版カー�ル��。
 
-2.6.x.y � "stable" �ーム <stable@kernel.org> �メンテ�れ��り��
-���隔週�リリース�れ����。
+2.6.x.y � "stable" �ーム <stable@kernel.org> �メンテ�れ��り�必
+��応��リリース�れ��。通常�リリース期間� 2週間毎����差�迫�
+��題���れ�も�少�長��る��も�り��。セキュリティ関連��題
+�場���れ�対�������場�����リリース��れ��。
 
 カー�ルツリー�入���る�Documentation/stable_kernel_rules.txt ファ
 イル����よ��種類�変更� -stable ツリー���入れ�能����リ
@@ -341,7 +345,9 @@ linux-kernel メーリングリストã�§å�Žé›†ã�•ã‚Œã�Ÿå¤šæ•°ã�®ãƒ‘ッãƒ�ã�¨å�Œæ
 メインライン�入れるよ�� Linus �プッシュ���。
 
 メインカー�ルツリー���る��� Linus ��る�������新��パッ
-�� -mm ツリー�テスト�れる���強�推奨�れ��。
+�� -mm ツリー�テスト�れる���強�推奨�れ����。マージウィン
+ドウ�開��� -mm ツリー��れ����パッ��メインライン�マージ�
+れる���困難��り��。
 
 �れら�カー�ル�安定��動作���システム���使�����切���
 り��ん��カー�ルブラン��中�もも��も動作�リスク�高�も���。
@@ -395,13 +401,15 @@ linux-kernel メーリングリストã�§å�Žé›†ã�•ã‚Œã�Ÿå¤šæ•°ã�®ãƒ‘ッãƒ�ã�¨å�Œæ
     - pcmcia, Dominik Brodowski <linux@dominikbrodowski.net>
         git.kernel.org:/pub/scm/linux/kernel/git/brodo/pcmcia-2.6.git
 
-    - SCSI, James Bottomley <James.Bottomley@SteelEye.com>
+    - SCSI, James Bottomley <James.Bottomley@hansenpartnership.com>
         git.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6.git
 
+    - x86, Ingo Molnar <mingo@elte.hu>
+        git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86.git
+
   quilt ツリー-
-    - USB, PCI ドライ�コア� I2C, Greg Kroah-Hartman <gregkh@suse.de>
+    - USB, ドライ�コア� I2C, Greg Kroah-Hartman <gregkh@suse.de>
         kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/
-    - x86-64 � i386 �仲間 Andi Kleen <ak@suse.de>
 
   ��他�カー�ルツリー� http://git.kernel.org/ � MAINTAINERS ファ
   イル�一覧表��り��。
@@ -412,13 +420,32 @@ linux-kernel メーリングリストã�§å�Žé›†ã�•ã‚Œã�Ÿå¤šæ•°ã�®ãƒ‘ッãƒ�ã�¨å�Œæ
 bugzilla.kernel.org � Linux カー�ル開発者�カー�ル��グを追跡�る
 場所��。ユーザ�見����グ�全�を��ツール�報告�����。
 �� kernel bugzilla を使���詳細��以下を�照������-
-        http://test.kernel.org/bugzilla/faq.html
-
+        http://bugzilla.kernel.org/page.cgi?id=faq.html
 メインカー�ルソースディレクトリ��るファイル REPORTING-BUGS �カー�
 ル�グら��も�������レ�ート�る��良�テンプレート��り��
 題�追跡を助�る���カー�ル開発者�����ん�情報�必�����詳
 細�書�れ����。
 
+�グレ�ート�管�
+-------------------
+
+�����ッキング�スキルを訓練�る最高�方法������他人�レ�ー
+ト���グを修正�る����り��。����カー�ルをより安定化��る
+��寄与�る��������������� �実��題を修正�る��を
+学��自分�スキルも強化�����他�開発者�����存在�気���
+��。�グを修正�る����多��開発者�中�ら自分�功績を��る最善
+��������ら多��人�他人��グ�修正�時間を浪費�る��を好�
+���ら��。
+
+���レ�ート�れ��グ����仕事を�る�����
+http://bugzilla.kernel.org �行������。も�今後��グレ�ート�
+���アド�イスを�������れ��bugme-new メーリングリスト(新�
+��グレ�ート������メール�れる) ��� bugme-janitor メーリン
+グリスト(bugzilla �変更毎����メール�れる)を購読����。
+
+        http://lists.linux-foundation.org/mailman/listinfo/bugme-new
+        http://lists.linux-foundation.org/mailman/listinfo/bugme-janitors
+
 メーリングリスト
 -------------
 
diff --git a/Documentation/ja_JP/SubmitChecklist b/Documentation/ja_JP/SubmitChecklist
new file mode 100644
index 000000000000..6c42e071d723
--- /dev/null
+++ b/Documentation/ja_JP/SubmitChecklist
@@ -0,0 +1,111 @@
+NOTE:
+This is a version of Documentation/SubmitChecklist into Japanese.
+This document is maintained by Takenori Nagano <t-nagano@ah.jp.nec.com>
+and the JF Project team <http://www.linux.or.jp/JF/>.
+If you find any difference between this document and the original file
+or a problem with the translation,
+please contact the maintainer of this file or JF project.
+
+Please also note that the purpose of this file is to be easier to read
+for non English (read: Japanese) speakers and is not intended as a
+fork. So if you have any comments or updates of this file, please try
+to update the original English file first.
+
+Last Updated: 2008/07/14
+==================================
+�れ��
+linux-2.6.26/Documentation/SubmitChecklist �和訳��。
+
+翻訳団体： JF プロジェクト < http://www.linux.or.jp/JF/ >
+翻訳日： 2008/07/14
+翻訳者： Takenori Nagano <t-nagano at ah dot jp dot nec dot com>
+校正者： Masanori Kobayashi �ん <zap03216 at nifty dot ne dot jp>
+==================================
+
+
+Linux カー�ルパッ�投稿者���ェックリスト
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+本書���パッ�をより素早��り込ん�もら���開発者�実践���基本的�事柄
+を����紹介���。����る全��事柄��Documentation/SubmittingPatches
+���Linuxカー�ルパッ�投稿�際���心得を補足�るも���。
+
+ 1: 妥当�CONFIGオプションや変更�れ�CONFIGオプション���り =y, =m, =n
+    全��正��ビルド��る��を確�������。��際�gcc��リンカ�
+    warningやerrorを出�������も確�������。
+
+ 2: allnoconfig, allmodconfig オプションを用��正��ビルド��る��を
+    確�������。
+
+ 3: 手許�クロスコンパイルツールやOSDL�PLM�よ��も�を用���複数�
+    アーキテク�ャ����も正��ビルド��る��を確�������。
+
+ 4: 64bit長�'unsigned long'を使用���るppc64��クロスコンパイル��
+    �ェック��当�アーキテク�ャ��。
+
+ 5: カー�ルコーディングスタイル�準拠���る����確�������(!)
+
+ 6: CONFIGオプション�追加・変更を��場����CONFIGメニュー�壊れ����
+    ��を確�������。
+
+ 7: 新��Kconfig�オプションを追加�る際���必���helpも記述������。
+
+ 8: �切�Kconfig��存関係を考���ら慎���ェック������。
+    ������作業�マシンを使��テスト���ん�行�����も困難��。
+    ���やる���自分�頭�考�る����。
+
+ 9: sparseを利用���ゃん���コード�ェックを������。
+
+10: 'make checkstack' � 'make namespacecheck' を利用���題�発見�れ�ら
+    修正������。'make checkstack' �明示的��題を示���ん���れ�
+    １��関数�512�イトより大��スタックを使���れ��修正���候補�
+    �り��。
+
+11: グロー�ル�kernel API を説明�る kernel-doc をソース�中��������。
+    ( static�関数�����必須���り��ん�����もら��も�構�� )
+    ����'make htmldocs' も��� 'make mandocs' を利用��追記��
+    ドキュメント��ェックを行���題�見����場���修正を行������。
+
+12: CONFIG_PREEMPT, CONFIG_DEBUG_PREEMPT, CONFIG_DEBUG_SLAB,
+    CONFIG_DEBUG_PAGEALLOC, CONFIG_DEBUG_MUTEXES, CONFIG_DEBUG_SPINLOCK,
+    CONFIG_DEBUG_SPINLOCK_SLEEP �れら全�を�時�有効���動作確�を
+    行������。
+
+13: CONFIG_SMP, CONFIG_PREEMPT を有効���場��無効���場��両方�
+    ビルド��上�動作確�を行������。
+
+14: も�パッ��ディスク�I/O性能���影響を与�るよ���れ��
+    'CONFIG_LBD'オプションを有効���場��無効���場��両方�
+    テストを実施��������。
+
+15: lockdep�機能を全�有効���上��全��コードパスを評価������。
+
+16: /proc �新��エントリを追加��場����Documentation/ �下�
+    必�ドキュメントを追加������。
+
+17: 新��ブートパラメータを追加��場����
+    必�Documentation/kernel-parameters.txt �説明を追加������。
+
+18: 新��module�パラメータを追加��場����MODULE_PARM_DESC()を
+    利用��必���説明を記述������。
+
+19: 新��userspaceインタフェースを作���場����Documentation/ABI/ �
+    Documentation/ABI/README を�考���必�ドキュメントを追加������。
+
+20: 'make headers_check'を実行��全��題�����を確�������。
+
+21: 少���もslabアロケーション�pageアロケーション�失敗��場��
+    挙動�����fault-injectionを利用��確�������。
+    Documentation/fault-injection/ を�照������。
+
+    追加��コード���り�������ら��サブシステム特有�
+    fault-injectionを追加�����良��も�れ��ん。
+
+22: 新��追加��コード��`gcc -W'�コンパイル������。
+    ��オプション�大�����メッセージを出力�����
+    "warning: comparison between signed and unsigned" �よ��メッセージ��
+    �グを見��る��役�立���。
+
+23: 投稿��パッ�� -mm パッ�セット�マージ�れ�後�全��既存�パッ�や
+    VM, VFS �よ���他�サブシステム�関�る様々�変更���時点�も共存
+    ��る��を確��るテストを行������。
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index e7bea3e85304..1150444a21ab 100644
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -365,6 +365,8 @@ and is between 256 and 4096 characters. It is defined in the file
                         no delay (0).
                         Format: integer
 
+        bootmem_debug   [KNL] Enable bootmem allocator debug messages.
+
         bttv.card=      [HW,V4L] bttv (bt848 + bt878 based grabber cards)
         bttv.radio=     Most important insmod options are available as
                         kernel args too.
@@ -1072,6 +1074,9 @@ and is between 256 and 4096 characters. It is defined in the file
 
                         * [no]ncq: Turn on or off NCQ.
 
+                        * nohrst, nosrst, norst: suppress hard, soft
+                          and both resets.
+
                         If there are multiple matching configurations changing
                         the same attribute, the last one is used.
 
diff --git a/Documentation/laptops/thinkpad-acpi.txt b/Documentation/laptops/thinkpad-acpi.txt
index 02dc748b76c4..71f0fe1fc1b0 100644
--- a/Documentation/laptops/thinkpad-acpi.txt
+++ b/Documentation/laptops/thinkpad-acpi.txt
@@ -44,7 +44,7 @@ detailed description):
         - LCD brightness control
         - Volume control
         - Fan control and monitoring: fan speed, fan enable/disable
-        - Experimental: WAN enable and disable
+        - WAN enable and disable
 
 A compatibility table by model and feature is maintained on the web
 site, http://ibm-acpi.sf.net/. I appreciate any success or failure
@@ -1375,18 +1375,13 @@ with EINVAL, try to set pwm1_enable to 1 and pwm1 to at least 128 (255
 would be the safest choice, though).
 
 
-EXPERIMENTAL: WAN
------------------
+WAN
+---
 
 procfs: /proc/acpi/ibm/wan
 sysfs device attribute: wwan_enable (deprecated)
 sysfs rfkill class: switch "tpacpi_wwan_sw"
 
-This feature is marked EXPERIMENTAL because the implementation
-directly accesses hardware registers and may not work as expected. USE
-WITH CAUTION! To use this feature, you need to supply the
-experimental=1 parameter when loading the module.
-
 This feature shows the presence and current state of a W-WAN (Sierra
 Wireless EV-DO) device.
 
diff --git a/Documentation/lguest/lguest.c b/Documentation/lguest/lguest.c
index b88b0ea54e90..7228369d1014 100644
--- a/Documentation/lguest/lguest.c
+++ b/Documentation/lguest/lguest.c
@@ -895,6 +895,9 @@ static void handle_console_output(int fd, struct virtqueue *vq, bool timeout)
         }
 }
 
+/* This is called when we no longer want to hear about Guest changes to a
+ * virtqueue.  This is more efficient in high-traffic cases, but it means we
+ * have to set a timer to check if any more changes have occurred. */
 static void block_vq(struct virtqueue *vq)
 {
         struct itimerval itm;
@@ -939,6 +942,11 @@ static void handle_net_output(int fd, struct virtqueue *vq, bool timeout)
         if (!timeout && num)
                 block_vq(vq);
 
+        /* We never quite know how long should we wait before we check the
+         * queue again for more packets.  We start at 500 microseconds, and if
+         * we get fewer packets than last time, we assume we made the timeout
+         * too small and increase it by 10 microseconds.  Otherwise, we drop it
+         * by one microsecond every time.  It seems to work well enough. */
         if (timeout) {
                 if (num < last_timeout_num)
                         timeout_usec += 10;
@@ -1447,21 +1455,6 @@ static void configure_device(int fd, const char *tapif, u32 ipaddr)
                 err(1, "Bringing interface %s up", tapif);
 }
 
-static void get_mac(int fd, const char *tapif, unsigned char hwaddr[6])
-{
-        struct ifreq ifr;
-
-        memset(&ifr, 0, sizeof(ifr));
-        strcpy(ifr.ifr_name, tapif);
-
-        /* SIOC stands for Socket I/O Control.  G means Get (vs S for Set
-         * above).  IF means Interface, and HWADDR is hardware address.
-         * Simple! */
-        if (ioctl(fd, SIOCGIFHWADDR, &ifr) != 0)
-                err(1, "getting hw address for %s", tapif);
-        memcpy(hwaddr, ifr.ifr_hwaddr.sa_data, 6);
-}
-
 static int get_tun_device(char tapif[IFNAMSIZ])
 {
         struct ifreq ifr;
@@ -1531,11 +1524,8 @@ static void setup_tun_net(char *arg)
         p = strchr(arg, ':');
         if (p) {
                 str2mac(p+1, conf.mac);
+                add_feature(dev, VIRTIO_NET_F_MAC);
                 *p = '\0';
-        } else {
-                p = arg + strlen(arg);
-                /* None supplied; query the randomly assigned mac. */
-                get_mac(ipfd, tapif, conf.mac);
         }
 
         /* arg is now either an IP address or a bridge name */
@@ -1547,13 +1537,10 @@ static void setup_tun_net(char *arg)
         /* Set up the tun device. */
         configure_device(ipfd, tapif, ip);
 
-        /* Tell Guest what MAC address to use. */
-        add_feature(dev, VIRTIO_NET_F_MAC);
         add_feature(dev, VIRTIO_F_NOTIFY_ON_EMPTY);
         /* Expect Guest to handle everything except UFO */
         add_feature(dev, VIRTIO_NET_F_CSUM);
         add_feature(dev, VIRTIO_NET_F_GUEST_CSUM);
-        add_feature(dev, VIRTIO_NET_F_MAC);
         add_feature(dev, VIRTIO_NET_F_GUEST_TSO4);
         add_feature(dev, VIRTIO_NET_F_GUEST_TSO6);
         add_feature(dev, VIRTIO_NET_F_GUEST_ECN);
diff --git a/Documentation/networking/Makefile b/Documentation/networking/Makefile
new file mode 100644
index 000000000000..6d8af1ac56c4
--- /dev/null
+++ b/Documentation/networking/Makefile
@@ -0,0 +1,8 @@
+# kbuild trick to avoid linker error. Can be omitted if a module is built.
+obj- := dummy.o
+
+# List of programs to build
+hostprogs-y := ifenslave
+
+# Tell kbuild to always build the programs
+always := $(hostprogs-y)
diff --git a/Documentation/networking/ifenslave.c b/Documentation/networking/ifenslave.c
index a12059886755..1b96ccda3836 100644
--- a/Documentation/networking/ifenslave.c
+++ b/Documentation/networking/ifenslave.c
@@ -1081,7 +1081,7 @@ static int set_if_addr(char *master_ifname, char *slave_ifname)
 
                 }
 
-                ipaddr = ifr.ifr_addr.sa_data;
+                ipaddr = (unsigned char *)ifr.ifr_addr.sa_data;
                 v_print("Interface '%s': set IP %s to %d.%d.%d.%d\n",
                         slave_ifname, ifra[i].desc,
                         ipaddr[0], ipaddr[1], ipaddr[2], ipaddr[3]);
diff --git a/Documentation/pcmcia/Makefile b/Documentation/pcmcia/Makefile
new file mode 100644
index 000000000000..accde871ae77
--- /dev/null
+++ b/Documentation/pcmcia/Makefile
@@ -0,0 +1,10 @@
+# kbuild trick to avoid linker error. Can be omitted if a module is built.
+obj- := dummy.o
+
+# List of programs to build
+hostprogs-y := crc32hash
+
+# Tell kbuild to always build the programs
+always := $(hostprogs-y)
+
+HOSTCFLAGS_crc32hash.o += -I$(objtree)/usr/include
diff --git a/Documentation/pcmcia/crc32hash.c b/Documentation/pcmcia/crc32hash.c
index cbc36d299af8..4210e5abab8a 100644
--- a/Documentation/pcmcia/crc32hash.c
+++ b/Documentation/pcmcia/crc32hash.c
@@ -26,7 +26,7 @@ int main(int argc, char **argv) {
                 printf("no string passed as argument\n");
                 return -1;
         }
-        result = crc32(argv[1], strlen(argv[1]));
+        result = crc32((unsigned char const *)argv[1], strlen(argv[1]));
         printf("0x%x\n", result);
         return 0;
 }
diff --git a/Documentation/rfkill.txt b/Documentation/rfkill.txt
index 28b6ec87c642..6fcb3060dec5 100644
--- a/Documentation/rfkill.txt
+++ b/Documentation/rfkill.txt
@@ -363,6 +363,11 @@ This rule exists because users of the rfkill subsystem expect to get (and set,
 when possible) the overall transmitter rfkill state, not of a particular rfkill
 line.
 
+5. During suspend, the rfkill class will attempt to soft-block the radio
+through a call to rfkill->toggle_radio, and will try to restore its previous
+state during resume.  After a rfkill class is suspended, it will *not* call
+rfkill->toggle_radio until it is resumed.
+
 Example of a WLAN wireless driver connected to the rfkill subsystem:
 --------------------------------------------------------------------
 
diff --git a/Documentation/scsi/ChangeLog.megaraid_sas b/Documentation/scsi/ChangeLog.megaraid_sas
index 716fcc1cafb5..c851ef497795 100644
--- a/Documentation/scsi/ChangeLog.megaraid_sas
+++ b/Documentation/scsi/ChangeLog.megaraid_sas
@@ -1,3 +1,26 @@
+
+1 Release Date    : Thur.July. 24 11:41:51 PST 2008 -
+                       (emaild-id:megaraidlinux@lsi.com)
+                       Sumant Patro
+                       Bo Yang
+
+2 Current Version : 00.00.04.01
+3 Older Version   : 00.00.03.22
+
+1. Add the new controller (0078, 0079) support to the driver
+       Those controllers are LSI's next generatation(gen2) SAS controllers.
+
+1 Release Date    : Mon.June. 23 10:12:45 PST 2008 -
+                       (emaild-id:megaraidlinux@lsi.com)
+                       Sumant Patro
+                       Bo Yang
+
+2 Current Version : 00.00.03.22
+3 Older Version   : 00.00.03.20
+
+1. Add shutdown DCMD cmd to the shutdown routine to make FW shutdown proper.
+2. Unexpected interrupt occurs in HWR Linux driver, add the dumy readl pci flush will fix this issue.
+
 1 Release Date    : Mon. March 10 11:02:31 PDT 2008 -
                         (emaild-id:megaraidlinux@lsi.com)
                         Sumant Patro
diff --git a/Documentation/sound/alsa/ALSA-Configuration.txt b/Documentation/sound/alsa/ALSA-Configuration.txt
index 6f6d117ac7e2..b117e42a6166 100644
--- a/Documentation/sound/alsa/ALSA-Configuration.txt
+++ b/Documentation/sound/alsa/ALSA-Configuration.txt
@@ -1144,8 +1144,6 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed.
 
     This module supports autoprobe and multiple cards.
 
-    Power management is _not_ supported.
-
   Module snd-ice1712
   ------------------
 
@@ -1628,8 +1626,6 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed.
 
     This module supports autoprobe and multiple cards.
 
-    Power management is _not_ supported.
-
   Module snd-pcsp
   -----------------
 
@@ -2081,13 +2077,11 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed.
   Module snd-virtuoso
   -------------------
 
-    Module for sound cards based on the Asus AV200 chip, i.e.,
-    Xonar D2 and Xonar D2X.
+    Module for sound cards based on the Asus AV100/AV200 chips,
+    i.e., Xonar D1, DX, D2 and D2X.
 
     This module supports autoprobe and multiple cards.
 
-    Power management is _not_ supported.
-
   Module snd-vx222
   ----------------
 
diff --git a/Documentation/spi/Makefile b/Documentation/spi/Makefile
new file mode 100644
index 000000000000..a5b03c88beae
--- /dev/null
+++ b/Documentation/spi/Makefile
@@ -0,0 +1,11 @@
+# kbuild trick to avoid linker error. Can be omitted if a module is built.
+obj- := dummy.o
+
+# List of programs to build
+hostprogs-y := spidev_test spidev_fdx
+
+# Tell kbuild to always build the programs
+always := $(hostprogs-y)
+
+HOSTCFLAGS_spidev_test.o += -I$(objtree)/usr/include
+HOSTCFLAGS_spidev_fdx.o += -I$(objtree)/usr/include
diff --git a/Documentation/usb/auerswald.txt b/Documentation/usb/auerswald.txt
deleted file mode 100644
index 7ee4d8f69116..000000000000
--- a/Documentation/usb/auerswald.txt
+++ /dev/null
@@ -1,30 +0,0 @@
-                Auerswald USB kernel driver
-                ===========================
-
-What is it? What can I do with it?
-==================================
-The auerswald USB kernel driver connects your linux 2.4.x
-system to the auerswald usb-enabled devices.
-
-There are two types of auerswald usb devices:
-a) small PBX systems (ISDN)
-b) COMfort system telephones (ISDN)
-
-The driver installation creates the devices
-/dev/usb/auer0..15. These devices carry a vendor-
-specific protocol. You may run all auerswald java
-software on it. The java software needs a native
-library "libAuerUsbJNINative.so" installed on
-your system. This library is available from
-auerswald and shipped as part of the java software.
-
-You may create the devices with:
-        mknod -m 666 /dev/usb/auer0 c 180 112
-        ...
-        mknod -m 666 /dev/usb/auer15 c 180 127
-
-Future plans
-============
-- Connection to ISDN4LINUX (the hisax interface)
-
-The maintainer of this driver is wolfgang@iksw-muees.de
diff --git a/Documentation/usb/power-management.txt b/Documentation/usb/power-management.txt
index b2fc4d4a9917..9d31140e3f5b 100644
--- a/Documentation/usb/power-management.txt
+++ b/Documentation/usb/power-management.txt
@@ -436,7 +436,12 @@ post_reset; the USB core guarantees that this is true of internal
 suspend/resume events as well.
 
 If a driver wants to block all suspend/resume calls during some
-critical section, it can simply acquire udev->pm_mutex.
+critical section, it can simply acquire udev->pm_mutex. Note that
+calls to resume may be triggered indirectly. Block IO due to memory
+allocations can make the vm subsystem resume a device. Thus while
+holding this lock you must not allocate memory with GFP_KERNEL or
+GFP_NOFS.
+
 Alternatively, if the critical section might call some of the
 usb_autopm_* routines, the driver can avoid deadlock by doing:
 
diff --git a/Documentation/video4linux/CARDLIST.au0828 b/Documentation/video4linux/CARDLIST.au0828
index eedc399e8deb..aa05e5bb22fb 100644
--- a/Documentation/video4linux/CARDLIST.au0828
+++ b/Documentation/video4linux/CARDLIST.au0828
@@ -3,3 +3,4 @@
   2 -> Hauppauge HVR850                         (au0828)        [2040:7240]
   3 -> DViCO FusionHDTV USB                     (au0828)        [0fe9:d620]
   4 -> Hauppauge HVR950Q rev xxF8               (au0828)        [2040:7201,2040:7211,2040:7281]
+  5 -> Hauppauge Woodbury                       (au0828)        [2040:8200]
diff --git a/Documentation/video4linux/Makefile b/Documentation/video4linux/Makefile
new file mode 100644
index 000000000000..1ed0e98d057d
--- /dev/null
+++ b/Documentation/video4linux/Makefile
@@ -0,0 +1,8 @@
+# kbuild trick to avoid linker error. Can be omitted if a module is built.
+obj- := dummy.o
+
+# List of programs to build
+hostprogs-y := v4lgrab
+
+# Tell kbuild to always build the programs
+always := $(hostprogs-y)
diff --git a/Documentation/video4linux/gspca.txt b/Documentation/video4linux/gspca.txt
index 78a863ab8a5a..0f03900c48fb 100644
--- a/Documentation/video4linux/gspca.txt
+++ b/Documentation/video4linux/gspca.txt
@@ -88,14 +88,14 @@ zc3xx		0471:0325	Philips SPC 200 NC
 zc3xx           0471:0326       Philips SPC 300 NC
 sonixj          0471:0327       Philips SPC 600 NC
 sonixj          0471:0328       Philips SPC 700 NC
-zc3xx           0471:032d       Philips spc210nc
-zc3xx           0471:032e       Philips spc315nc
-sonixj          0471:0330       Philips SPC 710NC
+zc3xx           0471:032d       Philips SPC 210 NC
+zc3xx           0471:032e       Philips SPC 315 NC
+sonixj          0471:0330       Philips SPC 710 NC
 spca501         0497:c001       Smile International
 sunplus         04a5:3003       Benq DC 1300
 sunplus         04a5:3008       Benq DC 1500
-sunplus         04a5:300a       Benq DC3410
-spca500         04a5:300c       Benq DC1016
+sunplus         04a5:300a       Benq DC 3410
+spca500         04a5:300c       Benq DC 1016
 sunplus         04f1:1001       JVC GC A50
 spca561         04fc:0561       Flexcam 100
 sunplus         04fc:500c       Sunplus CA500C
@@ -175,19 +175,21 @@ sunplus		08ca:2060	Aiptek PocketDV5300
 tv8532          0923:010f       ICM532 cams
 mars            093a:050f       Mars-Semi Pc-Camera
 pac207          093a:2460       PAC207 Qtec Webcam 100
-pac207          093a:2463       Philips spc200nc pac207
+pac207          093a:2463       Philips SPC 220 NC
 pac207          093a:2464       Labtec Webcam 1200
 pac207          093a:2468       PAC207
 pac207          093a:2470       Genius GF112
-pac207          093a:2471       PAC207 Genius VideoCam ge111
-pac207          093a:2472       PAC207 Genius VideoCam ge110
+pac207          093a:2471       Genius VideoCam ge111
+pac207          093a:2472       Genius VideoCam ge110
 pac7311         093a:2600       PAC7311 Typhoon
-pac7311         093a:2601       PAC7311 Phillips SPC610NC
+pac7311         093a:2601       Philips SPC 610 NC
 pac7311         093a:2603       PAC7312
-pac7311         093a:2608       PAC7311 Trust WB-3300p
-pac7311         093a:260e       PAC7311 Gigaware VGA PC Camera, Trust WB-3350p, SIGMA cam 2350
-pac7311         093a:260f       PAC7311 SnakeCam
+pac7311         093a:2608       Trust WB-3300p
+pac7311         093a:260e       Gigaware VGA PC Camera, Trust WB-3350p, SIGMA cam 2350
+pac7311         093a:260f       SnakeCam
 pac7311         093a:2621       PAC731x
+pac7311         093a:2624       PAC7302
+pac7311         093a:2626       Labtec 2200
 zc3xx           0ac8:0302       Z-star Vimicro zc0302
 vc032x          0ac8:0321       Vimicro generic vc0321
 vc032x          0ac8:0323       Vimicro Vc0323
@@ -220,6 +222,7 @@ sonixj		0c45:60c0	Sangha Sn535
 sonixj          0c45:60ec       SN9C105+MO4000
 sonixj          0c45:60fb       Surfer NoName
 sonixj          0c45:60fc       LG-LIC300
+sonixj          0c45:6128       Microdia/Sonix SNP325
 sonixj          0c45:612a       Avant Camera
 sonixj          0c45:612c       Typhoon Rasy Cam 1.3MPix
 sonixj          0c45:6130       Sonix Pccam
@@ -234,7 +237,7 @@ zc3xx		10fd:0128	Typhoon Webshot II USB 300k 0x0128
 spca561         10fd:7e50       FlyCam Usb 100
 zc3xx           10fd:8050       Typhoon Webshot II USB 300k
 spca501         1776:501c       Arowana 300K CMOS Camera
-t613            17a1:0128       T613/TAS5130A
+t613            17a1:0128       TASCORP JPEG Webcam, NGS Cyclops
 vc032x          17ef:4802       Lenovo Vc0323+MI1310_SOC
 pac207          2001:f115       D-Link DSB-C120
 spca500         2899:012c       Toptro Industrial
diff --git a/Documentation/vm/Makefile b/Documentation/vm/Makefile
new file mode 100644
index 000000000000..6f562f778b28
--- /dev/null
+++ b/Documentation/vm/Makefile
@@ -0,0 +1,8 @@
+# kbuild trick to avoid linker error. Can be omitted if a module is built.
+obj- := dummy.o
+
+# List of programs to build
+hostprogs-y := slabinfo
+
+# Tell kbuild to always build the programs
+always := $(hostprogs-y)
diff --git a/Documentation/vm/page_migration b/Documentation/vm/page_migration
index 99f89aa10169..d5fdfd34bbaf 100644
--- a/Documentation/vm/page_migration
+++ b/Documentation/vm/page_migration
@@ -18,10 +18,11 @@ migrate_pages function call takes two sets of nodes and moves pages of a
 process that are located on the from nodes to the destination nodes.
 Page migration functions are provided by the numactl package by Andi Kleen
 (a version later than 0.9.3 is required. Get it from
-ftp://ftp.suse.com/pub/people/ak). numactl provided libnuma which
-provides an interface similar to other numa functionality for page migration.
-cat /proc/<pid>/numa_maps allows an easy review of where the pages of
-a process are located. See also the numa_maps manpage in the numactl package.
+ftp://oss.sgi.com/www/projects/libnuma/download/). numactl provides libnuma
+which provides an interface similar to other numa functionality for page
+migration.  cat /proc/<pid>/numa_maps allows an easy review of where the
+pages of a process are located. See also the numa_maps documentation in the
+proc(5) man page.
 
 Manual migration is useful if for example the scheduler has relocated
 a process to a processor on a distant node. A batch scheduler or an
diff --git a/Documentation/watchdog/src/Makefile b/Documentation/watchdog/src/Makefile
new file mode 100644
index 000000000000..40e5f46e4740
--- /dev/null
+++ b/Documentation/watchdog/src/Makefile
@@ -0,0 +1,8 @@
+# kbuild trick to avoid linker error. Can be omitted if a module is built.
+obj- := dummy.o
+
+# List of programs to build
+hostprogs-y := watchdog-simple watchdog-test
+
+# Tell kbuild to always build the programs
+always := $(hostprogs-y)