Merge branch 'master' into for-next

Sync with Linus' tree to be able to apply patch to a newer
code (namely drivers/gpu/drm/gma500/psb_intel_lvds.c)

diff --git a/drivers/char/nvram.c b/drivers/char/nvram.c
index da3cfee782dc32eb76a724cb640b92d4da5f0dee..eaade8a1ecd72df7eead2abf8838518d5bb0fbeb 100644 (file)
--- a/drivers/char/nvram.c
+++ b/drivers/char/nvram.c
@@ -94,7 +94,7 @@
 /* Note that *all* calls to CMOS_READ and CMOS_WRITE must be done with
  * rtc_lock held. Due to the index-port/data-port design of the RTC, we
  * don't want two different things trying to get to it at once. (e.g. the
- * periodic 11 min sync from time.c vs. this driver.)
+ * periodic 11 min sync from kernel/time/ntp.c vs. this driver.)
  */
 
 #include <linux/types.h>

diff --git a/drivers/char/rtc.c b/drivers/char/rtc.c
index ccd124ab7ca7c54d3b6ae2cc947d01261954cd1d..872e09a02d239d7d32b92a26db00aad36fe16f67 100644 (file)
--- a/drivers/char/rtc.c
+++ b/drivers/char/rtc.c
@@ -57,8 +57,8 @@
  *     Note that *all* calls to CMOS_READ and CMOS_WRITE are done with
  *     interrupts disabled. Due to the index-port/data-port (0x70/0x71)
  *     design of the RTC, we don't want two different things trying to
- *     get to it at once. (e.g. the periodic 11 min sync from time.c vs.
- *     this driver.)
+ *     get to it at once. (e.g. the periodic 11 min sync from
+ *      kernel/time/ntp.c vs. this driver.)
  */
 
 #include <linux/interrupt.h>

diff --git a/drivers/macintosh/mediabay.c b/drivers/macintosh/mediabay.c
index 2fd435bc542e0db14a8488cbe97dc9380768dc72..831d7517c759294f4936e810f12008c257e5c1f4 100644 (file)
--- a/drivers/macintosh/mediabay.c
+++ b/drivers/macintosh/mediabay.c
@@ -356,7 +356,7 @@ static void poll_media_bay(struct media_bay_info* bay)
        static char *mb_content_types[] = {
                "a floppy drive",
                "a floppy drive",
-               "an unsuported audio device",
+               "an unsupported audio device",
                "an ATA device",
                "an unsupported PCI device",
                "an unknown device",

diff --git a/drivers/md/dm-bufio.c b/drivers/md/dm-bufio.c
index 0a6806f80ab5cdf40d4dba56c41dc74ad3db772b..b6e58c7b6df544fa3a9f2f2cff94a7da6af72c3f 100644 (file)
--- a/drivers/md/dm-bufio.c
+++ b/drivers/md/dm-bufio.c
@@ -12,7 +12,6 @@
 #include <linux/dm-io.h>
 #include <linux/slab.h>
 #include <linux/vmalloc.h>
-#include <linux/version.h>
 #include <linux/shrinker.h>
 #include <linux/module.h>
 

diff --git a/drivers/media/dvb/frontends/drxk_hard.c b/drivers/media/dvb/frontends/drxk_hard.c
index 6980ed7b8786b6048b5e4271db0f7758bb277204..5ab53795bd7ab605ea240ebbfb3970b37158b361 100644 (file)
--- a/drivers/media/dvb/frontends/drxk_hard.c
+++ b/drivers/media/dvb/frontends/drxk_hard.c
@@ -28,7 +28,6 @@
 #include <linux/delay.h>
 #include <linux/firmware.h>
 #include <linux/i2c.h>
-#include <linux/version.h>
 #include <asm/div64.h>
 
 #include "dvb_frontend.h"

diff --git a/drivers/mfd/ab5500-core.c b/drivers/mfd/ab5500-core.c
index bd56a764dea1f36cb522225e09ce4992e0733a56..54d0fe40845f0f00bf895d6edce27ea422eabd2e 100644 (file)
--- a/drivers/mfd/ab5500-core.c
+++ b/drivers/mfd/ab5500-core.c
@@ -28,7 +28,6 @@
 #include <linux/bitops.h>
 #include <linux/spinlock.h>
 #include <linux/mfd/core.h>
-#include <linux/version.h>
 #include <linux/mfd/db5500-prcmu.h>
 
 #include "ab5500-core.h"

diff --git a/drivers/scsi/mpt2sas/mpt2sas_config.c b/drivers/scsi/mpt2sas/mpt2sas_config.c
index 36ea0b2d80209e017e1ddffe50baf71eeaec4d2b..2b4d37613d325416b606cee8a096e961a62ce42a 100644 (file)
--- a/drivers/scsi/mpt2sas/mpt2sas_config.c
+++ b/drivers/scsi/mpt2sas/mpt2sas_config.c
@@ -149,7 +149,7 @@ _config_display_some_debug(struct MPT2SAS_ADAPTER *ioc, u16 smid,
                        desc = "raid_config";
                        break;
                case MPI2_CONFIG_EXTPAGETYPE_DRIVER_MAPPING:
-                       desc = "driver_mappping";
+                       desc = "driver_mapping";
                        break;
                }
                break;

diff --git a/drivers/tty/synclink_gt.c b/drivers/tty/synclink_gt.c
index 18b48cd3b41ddbbb7a76f1c8898b907fac1b09ca..01a1ff4d18f9e3525318b1feedbdc946e28be9ad 100644 (file)
--- a/drivers/tty/synclink_gt.c
+++ b/drivers/tty/synclink_gt.c
@@ -3924,7 +3924,7 @@ static void tdma_reset(struct slgt_info *info)
  */
 static void enable_loopback(struct slgt_info *info)
 {
-       /* SCR (serial control) BIT2=looopback enable */
+       /* SCR (serial control) BIT2=loopback enable */
        wr_reg16(info, SCR, (unsigned short)(rd_reg16(info, SCR) | BIT2));
 
        if (info->params.mode != MGSL_MODE_ASYNC) {

diff --git a/fs/ntfs/mft.c b/fs/ntfs/mft.c
index 382857f9c7db34c0edd3957f9beb65355e02f2a1..862f7ff57b78c8be60bc79b5b3854dac1d5b31a7 100644 (file)
--- a/fs/ntfs/mft.c
+++ b/fs/ntfs/mft.c
@@ -1367,7 +1367,7 @@ static int ntfs_mft_bitmap_extend_allocation_nolock(ntfs_volume *vol)
                        ntfs_error(vol->sb, "Failed to merge runlists for mft "
                                        "bitmap.");
                        if (ntfs_cluster_free_from_rl(vol, rl2)) {
-                               ntfs_error(vol->sb, "Failed to dealocate "
+                               ntfs_error(vol->sb, "Failed to deallocate "
                                                "allocated cluster.%s", es);
                                NVolSetErrors(vol);
                        }
@@ -1805,7 +1805,7 @@ static int ntfs_mft_data_extend_allocation_nolock(ntfs_volume *vol)
                ntfs_error(vol->sb, "Failed to merge runlists for mft data "
                                "attribute.");
                if (ntfs_cluster_free_from_rl(vol, rl2)) {
-                       ntfs_error(vol->sb, "Failed to dealocate clusters "
+                       ntfs_error(vol->sb, "Failed to deallocate clusters "
                                        "from the mft data attribute.%s", es);
                        NVolSetErrors(vol);
                }

diff --git a/fs/reiserfs/lbalance.c b/fs/reiserfs/lbalance.c
index 03d85cbf90bf644e40ef046c606c0dff61d99506..b43d01556313fd2f7b7ce8ba4494fe9534c43697 100644 (file)
--- a/fs/reiserfs/lbalance.c
+++ b/fs/reiserfs/lbalance.c
@@ -975,7 +975,7 @@ static int leaf_cut_entries(struct buffer_head *bh,
           remove */
        RFALSE(!is_direntry_le_ih(ih), "10180: item is not directory item");
        RFALSE(I_ENTRY_COUNT(ih) < from + del_count,
-              "10185: item contains not enough entries: entry_cout = %d, from = %d, to delete = %d",
+              "10185: item contains not enough entries: entry_count = %d, from = %d, to delete = %d",
               I_ENTRY_COUNT(ih), from, del_count);
 
        if (del_count == 0)

diff --git a/include/trace/events/power.h b/include/trace/events/power.h
index 1bcc2a8c00e29966aa8e48f1f135a3330364b668..b2626999e58060186764c182c4b996d5b059678c 100644 (file)
--- a/include/trace/events/power.h
+++ b/include/trace/events/power.h
@@ -65,7 +65,7 @@ TRACE_EVENT(machine_suspend,
        TP_printk("state=%lu", (unsigned long)__entry->state)
 );
 
-/* This code will be removed after deprecation time exceeded (2.6.41) */
+/* This code will be removed after deprecation time exceeded (3.1) */
 #ifdef CONFIG_EVENT_POWER_TRACING_DEPRECATED
 
 /*