Linus Torvalds 95b6886526 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6 ... * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6: (54 commits) tpm_nsc: Fix bug when loading multiple TPM drivers tpm: Move tpm_tis_reenable_interrupts out of CONFIG_PNP block tpm: Fix compilation warning when CONFIG_PNP is not defined TOMOYO: Update kernel-doc. tpm: Fix a typo tpm_tis: Probing function for Intel iTPM bug tpm_tis: Fix the probing for interrupts tpm_tis: Delay ACPI S3 suspend while the TPM is busy tpm_tis: Re-enable interrupts upon (S3) resume tpm: Fix display of data in pubek sysfs entry tpm_tis: Add timeouts sysfs entry tpm: Adjust interface timeouts if they are too small tpm: Use interface timeouts returned from the TPM tpm_tis: Introduce durations sysfs entry tpm: Adjust the durations if they are too small tpm: Use durations returned from TPM TOMOYO: Enable conditional ACL. TOMOYO: Allow using argv[]/envp[] of execve() as conditions. TOMOYO: Allow using executable's realpath and symlink's target as conditions. TOMOYO: Allow using owner/group etc. of file objects as conditions. ... Fix up trivial conflict in security/tomoyo/realpath.c		2011-07-27 19:26:38 -07:00
..
agp	agp/intel: Fix typo in G4x_GMCH_SIZE_VT_2M	2011-07-13 07:44:27 +01:00
hw_random	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2011-07-25 13:56:39 -07:00
ipmi	atomic: use <linux/atomic.h>	2011-07-26 16:49:47 -07:00
mwave	Fix common misspellings	2011-03-31 11:26:23 -03:00
pcmcia	pcmcia: Convert pcmcia_device_id declarations to const	2011-05-06 07:46:22 +02:00
tpm	tpm_nsc: Fix bug when loading multiple TPM drivers	2011-07-26 10:34:34 +10:00
xilinx_hwicap	treewide: Convert uses of struct resource to resource_size(ptr)	2011-06-10 14:55:36 +02:00
apm-emulation.c	PM: Improve error code of pm_notifier_call_chain()	2011-07-15 23:58:20 +02:00
applicom.c
applicom.h
bfin-otp.c
briq_panel.c
bsr.c	treewide: Convert uses of struct resource to resource_size(ptr)	2011-06-10 14:55:36 +02:00
ds1302.c
ds1620.c
dsp56k.c
dtlk.c
efirtc.c
generic_nvram.c	drivers: fix up various ->llseek() implementations	2011-07-20 20:47:58 -04:00
genrtc.c
hangcheck-timer.c
hpet.c	Merge branch 'x86-vdso-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip	2011-07-22 17:05:15 -07:00
i8k.c	i8k: Integrate with the hwmon subsystem	2011-05-25 20:43:33 +02:00
Kconfig	Allow setting of number of raw devices as a module parameter	2011-05-06 17:52:31 -07:00
lp.c
Makefile	drivers/char: add MSM smd_pkt driver	2011-03-23 19:46:38 -07:00
mbcs.c
mbcs.h	Fix common misspellings	2011-03-31 11:26:23 -03:00
mem.c	kmsg: properly support writev to avoid interleaved printk lines fix	2011-04-19 17:00:48 -07:00
misc.c
mmtimer.c	posix-timers: Cleanup namespace	2011-02-02 15:28:19 +01:00
msm_smd_pkt.c	drivers/char: add MSM smd_pkt driver	2011-03-23 19:46:38 -07:00
mspec.c	atomic: use <linux/atomic.h>	2011-07-26 16:49:47 -07:00
nsc_gpio.c
nvram.c	drivers: fix up various ->llseek() implementations	2011-07-20 20:47:58 -04:00
nwbutton.c	Fix common misspellings	2011-03-31 11:26:23 -03:00
nwbutton.h
nwflash.c
pc8736x_gpio.c
ppdev.c	drivers/char/ppdev.c: put gotten port value	2011-05-26 17:12:37 -07:00
ps3flash.c	fs: push i_mutex and filemap_write_and_wait down into ->fsync() handlers	2011-07-20 20:47:59 -04:00
ramoops.c	ramoops: make record_size a module parameter	2011-07-26 16:49:46 -07:00
random.c	ipv6: make fragment identifications less predictable	2011-07-21 21:25:58 -07:00
raw.c	RAW driver: Remove call to kobject_put().	2011-05-06 17:52:32 -07:00
rtc.c
scc.h
scx200_gpio.c
snsc.c
snsc.h
snsc_event.c
sonypi.c	Fix common misspellings	2011-03-31 11:26:23 -03:00
tb0219.c
tlclk.c
toshiba.c
ttyprintk.c	tty: now phase out the ioctl file pointer for good	2011-02-17 11:59:56 -08:00
uv_mmtimer.c
viotape.c
virtio_console.c	virtio console: don't manually set or finalize VIRTIO_CONSOLE_F_MULTIPORT.	2011-05-30 11:14:13 +09:30