Merge branch 'master' into next

diff --combined Documentation/kernel-parameters.txt
index e0df679c390288dea12042e31b6410464c565cc2,e4cbca58536c9f3ab4236f4db78eb22cacc993af..23f95eaf7c074fd9d06fafff7f966ed6db98ee50
--- 1/Documentation/kernel-parameters.txt
--- 2/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@@ -99,7 -99,6 +99,7 @@@ parameter is applicable
        SWSUSP  Software suspend (hibernation) is enabled.
        SUSPEND System suspend states are enabled.
        FTRACE  Function tracing enabled.
 +      TPM     TPM drivers are enabled.
        TS      Appropriate touchscreen support is enabled.
        UMS     USB Mass Storage support is enabled.
        USB     USB support is enabled.
@@@ -201,10 -200,6 +201,6 @@@ and is between 256 and 4096 characters
                        acpi_display_output=video
                        See above.
  
-       acpi_early_pdc_eval     [HW,ACPI] Evaluate processor _PDC methods
-                               early. Needed on some platforms to properly
-                               initialize the EC.
- 
        acpi_irq_balance [HW,ACPI]
                        ACPI will balance active IRQs
                        default in APIC mode
@@@ -2620,15 -2615,6 +2616,15 @@@
  
        tp720=          [HW,PS2]
  
 +      tpm_suspend_pcr=[HW,TPM]
 +                      Format: integer pcr id
 +                      Specify that at suspend time, the tpm driver
 +                      should extend the specified pcr with zeros,
 +                      as a workaround for some chips which fail to
 +                      flush the last written pcr on TPM_SaveState.
 +                      This will guarantee that all the other pcrs
 +                      are saved.
 +
        trace_buf_size=nn[KMG]
                        [FTRACE] will set tracing buffer size.
  
@@@ -2844,6 -2830,12 +2840,12 @@@
                        default x2apic cluster mode on platforms
                        supporting x2apic.
  
+       x86_mrst_timer= [X86-32,APBT]
+                       Choose timer option for x86 Moorestown MID platform.
+                       Two valid options are apbt timer only and lapic timer
+                       plus one apbt timer for broadcast timer.
+                       x86_mrst_timer=apbt_only | lapic_and_apbt
+ 
        xd=             [HW,XT] Original XT pre-IDE (RLL encoded) disks.
        xd_geo=         See header of drivers/block/xd.c.
  

diff --combined security/tomoyo/common.c
index 8ccf1299737833fdfc7dab00ad6ca9fd61a54385,ef89947a774bbf419aadc0ba6b942985b75b5b50..588f36a9337eef4c2b19fcbbc507c029a53ea993
--- 1/security/tomoyo/common.c
--- 2/security/tomoyo/common.c
+++ b/security/tomoyo/common.c
@@@ -886,6 -886,7 +886,7 @@@ static struct tomoyo_profile *tomoyo_fi
        ptr = kmalloc(sizeof(*ptr), GFP_KERNEL);
        if (!tomoyo_memory_ok(ptr)) {
                kfree(ptr);
+               ptr = NULL;
                goto ok;
        }
        for (i = 0; i < TOMOYO_MAX_CONTROL_INDEX; i++)
@@@ -1367,6 -1368,7 +1368,6 @@@ static bool tomoyo_print_path_acl(struc
  {
        int pos;
        u8 bit;
 -      const char *atmark = "";
        const char *filename;
        const u32 perm = ptr->perm | (((u32) ptr->perm_high) << 16);
  
@@@ -1381,7 -1383,8 +1382,7 @@@
                        continue;
                msg = tomoyo_path2keyword(bit);
                pos = head->read_avail;
 -              if (!tomoyo_io_printf(head, "allow_%s %s%s\n", msg,
 -                                    atmark, filename))
 +              if (!tomoyo_io_printf(head, "allow_%s %s\n", msg, filename))
                        goto out;
        }
        head->read_bit = 0;
@@@ -1404,6 -1407,8 +1405,6 @@@ static bool tomoyo_print_path2_acl(stru
                                   struct tomoyo_path2_acl *ptr)
  {
        int pos;
 -      const char *atmark1 = "";
 -      const char *atmark2 = "";
        const char *filename1;
        const char *filename2;
        const u8 perm = ptr->perm;
@@@ -1417,8 -1422,8 +1418,8 @@@
                        continue;
                msg = tomoyo_path22keyword(bit);
                pos = head->read_avail;
 -              if (!tomoyo_io_printf(head, "allow_%s %s%s %s%s\n", msg,
 -                                    atmark1, filename1, atmark2, filename2))
 +              if (!tomoyo_io_printf(head, "allow_%s %s %s\n", msg,
 +                                    filename1, filename2))
                        goto out;
        }
        head->read_bit = 0;