Linus Torvalds 158c12948f Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial ... Pull trivial tree changes from Jiri Kosina: "Summer edition of trivial tree updates" * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (23 commits) doc: fix two typos in watchdog-api.txt irq-gic: remove file name from heading comment MAINTAINERS: Add miscdevice.h to file list for char/misc drivers. scsi: mvsas: mv_sas.c: Fix for possible null pointer dereference doc: replace "practise" with "practice" in Documentation befs: remove check for CONFIG_BEFS_RW scsi: doc: fix 'SCSI_NCR_SETUP_MASTER_PARITY' drivers/usb/phy/phy.c: remove a leading space mfd: fix comment cpuidle: fix comment doc: hpfall.c: fix missing null-terminate after strncpy call usb: doc: hotplug.txt code typos kbuild: fix comment in Makefile.modinst SH: add proper prompt to SH_MAGIC_PANEL_R2_VERSION ARM: msm: Remove MSM_SCM crypto: Remove MPILIB_EXTRA doc: CN: remove dead link, kerneltrap.org no longer works media: update reference, kerneltrap.org no longer works hexagon: update reference, kerneltrap.org no longer works doc: LSM: update reference, kerneltrap.org no longer works ...		2014-08-06 21:03:53 -07:00
..
00-INDEX	ima: new templates management mechanism	2013-10-25 17:17:04 -04:00
apparmor.txt	Create Documentation/security/,	2011-05-19 15:59:38 -07:00
credentials.txt	Documentation: clarify the purpose of LSMs	2011-11-16 12:37:27 +11:00
IMA-templates.txt	ima: update IMA-templates.txt documentation	2014-01-03 07:42:59 -05:00
keys-ecryptfs.txt	encrypted-keys: move ecryptfs documentation to proper location	2011-06-30 19:08:14 +10:00
keys-request-key.txt	Create Documentation/security/,	2011-05-19 15:59:38 -07:00
keys-trusted-encrypted.txt	Documentation: Fix multiple typo in Documentation	2012-03-07 16:08:24 +01:00
keys.txt	KEYS: Call ->free_preparse() even after ->preparse() returns an error	2014-07-22 21:46:12 +01:00
LSM.txt	doc: LSM: update reference, kerneltrap.org no longer works	2014-06-19 15:15:28 +02:00
SELinux.txt	Create Documentation/security/,	2011-05-19 15:59:38 -07:00
Smack.txt	Merge branch 'serge-next-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sergeh/linux-security	2014-06-10 10:05:36 -07:00
tomoyo.txt	Create Documentation/security/,	2011-05-19 15:59:38 -07:00
Yama.txt	doc: spelling error changes	2014-05-05 15:32:05 +02:00