Linus Torvalds 8d71ff0bef 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: (24 commits) integrity: special fs magic As pointed out by Jonathan Corbet, the timer must be deleted before ERROR: code indent should use tabs where possible The tpm_dev_release function is only called for platform devices, not pnp Protect tpm_chip_list when transversing it. Renames num_open to is_open, as only one process can open the file at a time. Remove the BKL calls from the TPM driver, which were added in the overall netlabel: Add configuration support for local labeling cipso: Add support for native local labeling and fixup mapping names netlabel: Changes to the NetLabel security attributes to allow LSMs to pass full contexts selinux: Cache NetLabel secattrs in the socket's security struct selinux: Set socket NetLabel based on connection endpoint netlabel: Add functionality to set the security attributes of a packet netlabel: Add network address selectors to the NetLabel/LSM domain mapping netlabel: Add a generic way to create ordered linked lists of network addrs netlabel: Replace protocol/NetLabel linking with refrerence counts smack: Fix missing calls to netlbl_skbuff_err() selinux: Fix missing calls to netlbl_skbuff_err() selinux: Fix a problem in security_netlbl_sid_to_secattr() selinux: Better local/forward check in selinux_ip_postroute() ...		2008-10-13 10:00:44 -07:00
..
agp	linux-next: fix x86 tree build failure	2008-08-25 12:28:33 +02:00
hw_random	sparc: Annotate of_device_id arrays with const or __initdata.	2008-08-31 01:23:17 -07:00
ip2	tty: kref the tty driver object	2008-10-13 09:51:42 -07:00
ipmi	drivers/char/ipmi/ipmi_si_intf.c:default_find_bmc(): fix leak	2008-08-20 15:40:31 -07:00
mwave	mwave: ioctl BKL pushdown	2008-07-25 10:53:43 -07:00
pcmcia	tty: ipw need reworking	2008-10-13 09:51:40 -07:00
rio	rio: push down the BKL into the firmware ioctl handler	2008-07-25 10:53:43 -07:00
tpm	As pointed out by Jonathan Corbet, the timer must be deleted before	2008-10-11 09:05:20 +11:00
xilinx_hwicap	removed unused #include <linux/version.h>'s	2008-08-23 12:14:12 -07:00
.gitignore
amiserial.c	tty: Remove lots of NULL checks	2008-10-13 09:51:44 -07:00
apm-emulation.c	APM emulation: Notify about all suspend events, not just APM invoked ones (v2)	2008-07-16 23:27:02 +02:00
applicom.c	applicom: Fix an unchecked user ioctl range and an error return	2008-10-13 09:51:44 -07:00
applicom.h
bfin-otp.c
briq_panel.c	briq_panel: BKL pushdown	2008-06-20 14:05:55 -06:00
bsr.c	powerpc: Add driver for Barrier Synchronization Register	2008-07-15 12:24:55 +10:00
cd1865.h
ChangeLog
consolemap.c	Basic braille screen reader support	2008-04-30 08:29:52 -07:00
cp437.uni
cs5535_gpio.c	Add a bunch of cycle_kernel_lock() calls	2008-06-20 14:05:53 -06:00
cyclades.c	Char: cyclades. remove bogus iomap	2008-10-13 09:51:38 -07:00
defkeymap.c_shipped
defkeymap.map
digi1.h
digiFep1.h
digiPCI.h
ds1286.c	ds1286: BKL pushdown	2008-06-20 14:05:56 -06:00
ds1302.c	ds1302: push down the BKL into the driver ioctl code	2008-07-25 10:53:43 -07:00
ds1620.c	[ARM] Move include/asm-arm/arch-* to arch/arm/*/include/mach	2008-08-07 09:55:48 +01:00
dsp56k.c	dsp56k: Fix BKL pushdown	2008-07-26 13:22:56 -07:00
dtlk.c	Add a bunch of cycle_kernel_lock() calls	2008-06-20 14:05:53 -06:00
efirtc.c	drivers/char/efirtc.c: removed duplicated #include	2008-08-04 16:59:56 -07:00
epca.c	epca: call tty_port_init	2008-10-13 09:51:38 -07:00
epca.h	epca: use tty_port	2008-07-20 17:12:36 -07:00
epcaconfig.h
esp.c	tty: rework break handling	2008-07-22 13:03:28 -07:00
generic_nvram.c	driver/char/generic_nvram: fix banner	2008-06-12 18:05:41 -07:00
generic_serial.c	tty: Remove lots of NULL checks	2008-10-13 09:51:44 -07:00
genrtc.c	genrtc: BKL pushdown	2008-06-20 14:05:57 -06:00
hangcheck-timer.c
hpet.c	HPET: Remove spurious HPET busy warning message.	2008-10-10 09:25:43 +02:00
hvc_beat.c
hvc_console.c	drivers/char/hvc_console.c: adjust call to put_tty_driver	2008-10-13 09:51:37 -07:00
hvc_console.h	powerpc: Move include files to arch/powerpc/include/asm	2008-08-04 12:02:00 +10:00
hvc_irq.c	hvc_console: rework setup to replace irq functions with callbacks	2008-07-25 12:06:06 +10:00
hvc_iseries.c	hvc_console: rework setup to replace irq functions with callbacks	2008-07-25 12:06:06 +10:00
hvc_rtas.c
hvc_vio.c	hvc_console: rework setup to replace irq functions with callbacks	2008-07-25 12:06:06 +10:00
hvc_xen.c	xen: clean up domain mode predicates	2008-08-20 12:40:07 +02:00
hvcs.c	powerpc: Move include files to arch/powerpc/include/asm	2008-08-04 12:02:00 +10:00
hvsi.c	drivers/char: replace remaining __FUNCTION__ occurrences	2008-04-30 08:29:54 -07:00
i8k.c	i8k: make fan multiplier tunable with a module parameter	2008-05-01 08:04:00 -07:00
ip27-rtc.c	ip27-rtc: BKL pushdown	2008-06-20 14:05:57 -06:00
isicom.c	tty: kref usage for isicom and moxa	2008-10-13 09:51:41 -07:00
istallion.c	tty: Remove lots of NULL checks	2008-10-13 09:51:44 -07:00
Kconfig	stallion: Use krefs	2008-10-13 09:51:41 -07:00
keyboard.c	Merge master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6 into next	2008-07-21 00:55:14 -04:00
lp.c	device create: char: convert device_create to device_create_drvdata	2008-07-21 21:54:41 -07:00
Makefile	tty: Split tty_port into its own file	2008-10-13 09:51:40 -07:00
mbcs.c	mbcs: cdev lock_kernel() pushdown	2008-06-20 14:05:48 -06:00
mbcs.h
mem.c	use generic_access_phys for /dev/mem mappings	2008-07-24 10:47:15 -07:00
misc.c	device create: char: convert device_create to device_create_drvdata	2008-07-21 21:54:41 -07:00
mmtimer.c	mmtimer: Push BKL down into the ioctl handler	2008-07-17 11:34:49 -07:00
moxa.c	tty: kref usage for isicom and moxa	2008-10-13 09:51:41 -07:00
moxa.h	Char: moxa, cleanup rx/tx	2008-04-30 08:29:43 -07:00
mspec.c	mspec: convert nopfn to fault	2008-07-24 10:47:14 -07:00
mxser.c	tty: Remove lots of NULL checks	2008-10-13 09:51:44 -07:00
mxser.h	mxser: convert large macros to functions	2008-04-30 08:29:49 -07:00
n_hdlc.c	tty: some ICANON magic is in the wrong places	2008-10-13 09:51:44 -07:00
n_r3964.c	tty: Remove lots of NULL checks	2008-10-13 09:51:44 -07:00
n_tty.c	tty: rename the remaining oddly named n_tty functions	2008-10-13 09:51:45 -07:00
nozomi.c	nozomi: Fix close on error	2008-10-13 09:51:39 -07:00
nsc_gpio.c
nvram.c	drivers/char/nvram.c: Removed duplicated include	2008-07-23 09:36:23 -07:00
nwbutton.c
nwbutton.h
nwflash.c	[ARM] fix nwflash.c: 6ee8928d94	2008-07-26 16:29:24 +01:00
pc8736x_gpio.c	Add a bunch of cycle_kernel_lock() calls	2008-06-20 14:05:53 -06:00
ppdev.c	ppdev: wrap ioctl handler in driver and push lock down	2008-07-25 10:53:43 -07:00
ps3flash.c
pty.c	pty: simplify unix98 allocation	2008-10-13 09:51:44 -07:00
random.c	block: don't depend on consecutive minor space	2008-10-09 08:56:05 +02:00
raw.c	device create: char: convert device_create to device_create_drvdata	2008-07-21 21:54:41 -07:00
riscom8.c	riscom8: Restore driver using new break functionality	2008-07-22 13:03:28 -07:00
riscom8.h	tty: add more tty_port fields	2008-07-20 17:12:38 -07:00
riscom8_reg.h
rocket.c	tty: rework break handling	2008-07-22 13:03:28 -07:00
rocket.h	tty: add more tty_port fields	2008-07-20 17:12:38 -07:00
rocket_int.h	tty: add more tty_port fields	2008-07-20 17:12:38 -07:00
rtc.c	sparc32: Convert PC RTC probing to pure OF driver.	2008-08-30 00:23:51 -07:00
scc.h
scx200_gpio.c	Add a bunch of cycle_kernel_lock() calls	2008-06-20 14:05:53 -06:00
selection.c	tty: Ldisc revamp	2008-07-20 17:12:34 -07:00
ser_a2232.c	m68k: gs: use tty_port fixes	2008-07-26 20:29:03 -07:00
ser_a2232.h
ser_a2232fw.ax
ser_a2232fw.h
serial167.c	m68k: serial167 missing return value in cy_put_char()	2008-05-05 12:37:02 -07:00
snsc.c	device create: char: convert device_create to device_create_drvdata	2008-07-21 21:54:41 -07:00
snsc.h
snsc_event.c	byteorder: don't directly include linux/byteorder/generic.h	2008-05-16 12:01:45 -07:00
sonypi.c	sonypi: BKL pushdown	2008-07-02 15:06:25 -06:00
specialix.c	specialix: restore driver using new break functionality	2008-07-22 13:03:28 -07:00
specialix_io8.h	tty: add more tty_port fields	2008-07-20 17:12:38 -07:00
stallion.c	tty: Remove lots of NULL checks	2008-10-13 09:51:44 -07:00
sx.c	Char: sx, fix io unmapping	2008-10-13 09:51:39 -07:00
sx.h
sxboards.h
sxwindow.h
synclink.c	Merge branch 'for-jeff' of git://git.kernel.org/pub/scm/linux/kernel/git/chris/linux-2.6 into tmp	2008-08-07 04:05:46 -04:00
synclink_gt.c	removed unused #include <version.h>	2008-08-16 17:21:58 -07:00
synclinkmp.c	Merge branch 'for-jeff' of git://git.kernel.org/pub/scm/linux/kernel/git/chris/linux-2.6 into tmp	2008-08-07 04:05:46 -04:00
sysrq.c	fix: "smp_call_function: get rid of the unused nonatomic/retry argument"	2008-06-27 11:52:45 +02:00
tb0219.c	Add a bunch of cycle_kernel_lock() calls	2008-06-20 14:05:53 -06:00
tlclk.c	tlckl: BKL pushdown	2008-06-20 14:05:51 -06:00
toshiba.c	toshiba: use ioremap_cached	2008-04-30 23:15:34 +02:00
tty_audit.c	audit: Handle embedded NUL in TTY input auditing	2008-10-13 09:51:39 -07:00
tty_buffer.c	tty: split the buffering from tty_io	2008-10-13 09:51:40 -07:00
tty_io.c	tty: tty_io.c shadows sparse fix	2008-10-13 09:51:44 -07:00
tty_ioctl.c	tty: some ICANON magic is in the wrong places	2008-10-13 09:51:44 -07:00
tty_ldisc.c	try harder to load tty ldisc driver	2008-08-01 12:50:15 -07:00
tty_port.c	tty: usb-serial krefs	2008-10-13 09:51:41 -07:00
vc_screen.c	device create: char: convert device_create to device_create_drvdata	2008-07-21 21:54:41 -07:00
viotape.c	device create: char: convert device_create to device_create_drvdata	2008-07-21 21:54:41 -07:00
virtio_console.c	virtio_console: use virtqueue notification for hvc_console	2008-07-25 12:06:06 +10:00
vme_scc.c	m68k: gs: use tty_port fixes	2008-07-26 20:29:03 -07:00
vr41xx_giu.c	Add a bunch of cycle_kernel_lock() calls	2008-06-20 14:05:53 -06:00
vt.c	tty: Remove more special casing and out of place code	2008-10-13 09:51:42 -07:00
vt_ioctl.c	tty: move tioclinux from a special case	2008-10-13 09:51:40 -07:00