Linus Torvalds 2be4ff2f08 Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6 ... * git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6: (49 commits) pcmcia: ioctl-internal definitions pcmcia: cistpl header cleanup pcmcia: remove unused argument to pcmcia_parse_tuple() pcmcia: card services header cleanup pcmcia: device_id header cleanup pcmcia: encapsulate ioaddr_t pcmcia: cleanup device driver header file pcmcia: cleanup socket services header file pcmcia: merge ds_internal.h into cs_internal.h pcmcia: cleanup cs_internal.h pcmcia: cs_internal.h is internal pcmcia: use dev_printk for cs_error() pcmcia: remove CS_ error codes alltogether pcmcia: deprecate CS_BAD_TUPLE pcmcia: deprecate CS_BAD_ARGS pcmcia: deprecate CS_BAD_BASE, CS_BAD_IRQ, CS_BAD_OFFSET and CS_BAD_SIZE pcmcia: deprecate CS_BAD_ATTRIBUTE, CS_BAD_TYPE and CS_BAD_PAGE pcmcia: deprecate CS_NO_MORE_ITEMS pcmcia: deprecate CS_IN_USE pcmcia: deprecate CS_CONFIGURATION_LOCKED ... Fix trivial conflict in drivers/pcmcia/ds.c manually		2008-10-13 14:12:40 -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	Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6	2008-10-13 14:12: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	…
ChangeLog	…
Kconfig	stallion: Use krefs	2008-10-13 09:51:41 -07:00
Makefile	tty: Split tty_port into its own file	2008-10-13 09:51:40 -07:00
amiserial.c	tty: Remove lots of NULL checks	2008-10-13 09:51:44 -07:00
apm-emulation.c	…
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	…
bsr.c	…
cd1865.h	…
consolemap.c	…
cp437.uni	…
cs5535_gpio.c	…
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	…
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	…
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	…
epcaconfig.h	…
esp.c	…
generic_nvram.c	…
generic_serial.c	tty: Remove lots of NULL checks	2008-10-13 09:51:44 -07:00
genrtc.c	…
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	…
i8k.c	…
ip27-rtc.c	…
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
keyboard.c	…
lp.c	…
mbcs.c	…
mbcs.h	…
mem.c	…
misc.c	…
mmtimer.c	…
moxa.c	tty: kref usage for isicom and moxa	2008-10-13 09:51:41 -07:00
moxa.h	…
mspec.c	…
mxser.c	tty: Remove lots of NULL checks	2008-10-13 09:51:44 -07:00
mxser.h	…
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	…
nwbutton.c	…
nwbutton.h	…
nwflash.c	[ARM] fix nwflash.c: 6ee8928d94	2008-07-26 16:29:24 +01:00
pc8736x_gpio.c	…
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	…
riscom8.c	…
riscom8.h	…
riscom8_reg.h	…
rocket.c	…
rocket.h	…
rocket_int.h	…
rtc.c	sparc32: Convert PC RTC probing to pure OF driver.	2008-08-30 00:23:51 -07:00
scc.h	…
scx200_gpio.c	…
selection.c	…
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	…
snsc.c	…
snsc.h	…
snsc_event.c	…
sonypi.c	…
specialix.c	…
specialix_io8.h	…
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	…
tb0219.c	…
tlclk.c	…
toshiba.c	…
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	…
viotape.c	…
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	…
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