Ingo Molnar 3d58f48ba0 Merge branch 'linus' into irq/numa ... Conflicts: arch/mips/sibyte/bcm1480/irq.c arch/mips/sibyte/sb1250/irq.c Merge reason: we gathered a few conflicts plus update to latest upstream fixes. Signed-off-by: Ingo Molnar <mingo@elte.hu>		2009-06-01 21:06:21 +02:00
..
agp	Merge branch 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6	2009-04-20 08:42:48 -07:00
hw_random	virtio-rng: Remove false BUG for spurious callbacks	2009-04-24 13:28:30 -07:00
ip2	proc tty: switch ip2 to ->proc_fops	2009-04-01 08:59:08 -07:00
ipmi	ipmi: fix ipmi_si modprobe hang	2009-05-22 07:30:41 -07:00
mwave
pcmcia	proc tty: switch synclink_cs to ->proc_fops	2009-04-01 08:59:08 -07:00
rio	rio: addition has higher precedence than ?:	2009-04-06 14:36:43 -07:00
tpm	TPM: get_event_name stack corruption	2009-05-20 08:30:05 +10:00
xilinx_hwicap
.gitignore
amiserial.c	proc tty: switch amiserial to ->proc_fops	2009-04-01 08:59:10 -07:00
apm-emulation.c
applicom.c	applicom: Auto-load applicom module when device opened.	2009-04-06 14:36:30 -07:00
applicom.h
bfin-otp.c
briq_panel.c
bsr.c	trivial: drivers/char/bsr.c: Storage class should be before const qualifier	2009-03-30 15:22:02 +02:00
cd1865.h
ChangeLog
consolemap.c
cp437.uni
cs5535_gpio.c
cyclades.c	cyclades: Auto-load cyclades module when device opened.	2009-04-06 14:36:30 -07:00
defkeymap.c_shipped
defkeymap.map
digi1.h
digiFep1.h
digiPCI.h
ds1302.c
ds1620.c
dsp56k.c
dtlk.c
efirtc.c
epca.c
epca.h
epcaconfig.h
esp.c	esp: fix section mismatch warning	2009-04-07 08:31:03 -07:00
generic_nvram.c
generic_serial.c
genrtc.c
hangcheck-timer.c
hpet.c	irq: change ACPI GSI APIs to also take a device argument	2009-04-28 12:21:17 +02:00
hvc_beat.c
hvc_console.c
hvc_console.h
hvc_irq.c
hvc_iseries.c
hvc_iucv.c
hvc_rtas.c
hvc_udbg.c
hvc_vio.c
hvc_xen.c
hvcs.c
hvsi.c
i8k.c
isicom.c	isicom: isicom kref leak fix	2009-04-06 14:36:33 -07:00
istallion.c	proc tty: switch istallion to ->proc_fops	2009-04-01 08:59:08 -07:00
Kconfig
keyboard.c
lp.c
Makefile
mbcs.c
mbcs.h
mem.c	x86, PAT: Remove duplicate memtype reserve in devmem mmap	2009-04-10 13:55:48 +02:00
misc.c
mmtimer.c
moxa.c	tty: moxa, fix refcounting in moxa_poll_port	2009-04-06 14:36:33 -07:00
moxa.h
mspec.c
mxser.c	mxser: remove tty_port_tty_get from mxser_check_modem_status	2009-04-06 14:36:33 -07:00
mxser.h
n_hdlc.c
n_r3964.c
n_tty.c
nozomi.c
nsc_gpio.c
nvram.c
nwbutton.c
nwbutton.h
nwflash.c
pc8736x_gpio.c
ppdev.c
ps3flash.c
pty.c
random.c	Avoid ICE in get_random_int() with gcc-3.4.5	2009-05-19 11:25:35 -07:00
raw.c
riscom8.c	riscom8: Auto-load riscom8 module when device opened.	2009-04-06 14:36:31 -07:00
riscom8.h
riscom8_reg.h
rocket.c
rocket.h
rocket_int.h
rtc.c
scc.h
scx200_gpio.c
selection.c
ser_a2232.c
ser_a2232.h
ser_a2232fw.ax
ser_a2232fw.h
serial167.c
snsc.c
snsc.h
snsc_event.c
sonypi.c
specialix.c	specialix: Auto-load specialix module when device opened.	2009-04-06 14:36:31 -07:00
specialix_io8.h
stallion.c	proc tty: switch stallion to ->proc_fops	2009-04-01 08:59:09 -07:00
sx.c
sx.h
sxboards.h
sxwindow.h
synclink.c	proc tty: switch synclink to ->proc_fops	2009-04-01 08:59:09 -07:00
synclink_gt.c	synclink_gt: add clock options	2009-04-02 19:05:01 -07:00
synclinkmp.c	proc tty: switch synclinkmp to ->proc_fops	2009-04-01 08:59:09 -07:00
sysrq.c	sysrq, intel_fb: fix sysrq g collision	2009-05-15 07:56:24 -05:00
tb0219.c
tlclk.c
toshiba.c
tty_audit.c	Trim includes of fdtable.h	2009-03-31 23:00:28 -04:00
tty_buffer.c
tty_io.c	pids: kill signal_struct-> __pgrp/__session and friends	2009-04-02 19:05:02 -07:00
tty_ioctl.c
tty_ldisc.c	Trim includes of fdtable.h	2009-03-31 23:00:28 -04:00
tty_port.c
vc_screen.c
viotape.c
virtio_console.c
vme_scc.c
vr41xx_giu.c
vt.c	Revert "console ASCII glyph 1:1 mapping"	2009-04-19 10:51:40 -07:00
vt_ioctl.c	vt: Add a note on the historical abuse of CLOCK_TICK_RATE	2009-05-06 14:47:13 -07:00