Merge remote-tracking branch 'security/next'

Conflicts:
	drivers/char/tpm/tpm-chip.c

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/char/tpm/tpm_infineon.c
index 29ba520ac24d2fb60cd8d2e788774fc69bdd40c2,922f60e1e0a01ba86e628c2363321e5a04879266..6c488e635fdd07ec9e5f885d8780a18595108b2d
--- 1/drivers/char/tpm/tpm_infineon.c
--- 2/drivers/char/tpm/tpm_infineon.c
+++ b/drivers/char/tpm/tpm_infineon.c
@@@ -632,12 -615,24 +615,13 @@@ static struct pnp_driver tpm_inf_pnp_dr
        .name = "tpm_inf_pnp",
        .id_table = tpm_inf_pnp_tbl,
        .probe = tpm_inf_pnp_probe,
-       .suspend = tpm_inf_pnp_suspend,
-       .resume = tpm_inf_pnp_resume,
-       .remove = tpm_inf_pnp_remove
+       .remove = tpm_inf_pnp_remove,
+       .driver = {
+               .pm = &tpm_inf_pm,
+       }
  };
  
 -static int __init init_inf(void)
 -{
 -      return pnp_register_driver(&tpm_inf_pnp_driver);
 -}
 -
 -static void __exit cleanup_inf(void)
 -{
 -      pnp_unregister_driver(&tpm_inf_pnp_driver);
 -}
 -
 -module_init(init_inf);
 -module_exit(cleanup_inf);
 +module_pnp_driver(tpm_inf_pnp_driver);
  
  MODULE_AUTHOR("Marcel Selhorst <tpmdd@sirrix.com>");
  MODULE_DESCRIPTION("Driver for Infineon TPM SLD 9630 TT 1.1 / SLB 9635 TT 1.2");

diff --cc security/smack/smack_lsm.c
Simple merge