Linus Torvalds 03a2c4d76c Merge branch 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6 ... * 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6: (151 commits) vga_switcheroo: disable default y by new rules. drm/nouveau: fix *staging* driver build with switcheroo off. drm/radeon: fix typo in Makefile vga_switcheroo: fix build on platforms with no ACPI drm/radeon: Fix printf type warning in 64bit system. drm/radeon/kms: bump the KMS version number for square tiling support. vga_switcheroo: initial implementation (v15) drm/radeon/kms: do not disable audio engine twice Revert "drm/radeon/kms: disable HDMI audio for now on rv710/rv730" drm/radeon/kms: do not preset audio stuff and start timer when not using audio drm/radeon: r100/r200 ums: block ability for userspace app to trash 0 page and beyond drm/ttm: fix function prototype to match implementation drm/radeon: use ALIGN instead of open coding it drm/radeon/kms: initialize set_surface_reg reg for rs600 asic drm/i915: Use a dmi quirk to skip a broken SDVO TV output. drm/i915: enable/disable LVDS port at DPMS time drm/i915: check for multiple write domains in pin_and_relocate drm/i915: clean-up i915_gem_flush_gpu_write_domain drm/i915: reuse i915_gpu_idle helper drm/i915: ensure lru ordering of fence_list ... Fixed trivial conflicts in drivers/gpu/vga/Kconfig		2010-03-04 07:49:37 -08:00
..
agp	Merge branch 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6	2010-03-04 07:49:37 -08:00
hw_random	Merge with mainline to remove plat-omap/Kconfig conflict	2010-03-01 14:19:05 -08:00
ip2	tty: declare MODULE_FIRMWARE in various drivers	2010-03-02 14:43:15 -08:00
ipmi	ACPI: fix ACPI=n allmodconfig build	2009-12-30 01:24:25 -05:00
mwave	…
pcmcia	cm4000_cs.c: Remove unnecessary cast	2010-02-17 17:37:33 +01:00
rio	…
tpm	tpm_infineon: fix suspend/resume handler for pnp_driver	2010-02-11 13:59:42 -08:00
xilinx_hwicap	…
.gitignore	…
ChangeLog	…
Kconfig	virtio: console: Associate each port with a char device	2010-02-24 14:22:53 +10:30
Makefile	tty: esp: remove broken driver	2009-12-11 15:18:03 -08:00
amiserial.c	…
apm-emulation.c	…
applicom.c	…
applicom.h	…
bfin-otp.c	…
bfin_jtag_comm.c	tty: const: constify remaining tty_operations	2009-12-11 15:18:03 -08:00
briq_panel.c	…
bsr.c	…
cd1865.h	…
consolemap.c	…
cp437.uni	…
cs5535_gpio.c	…
cyclades.c	tty: declare MODULE_FIRMWARE in various drivers	2010-03-02 14:43:15 -08:00
defkeymap.c_shipped	…
defkeymap.map	…
digi1.h	…
digiFep1.h	…
digiPCI.h	…
ds1302.c	…
ds1620.c	…
dsp56k.c	…
dtlk.c	…
efirtc.c	efirtc: explicitly set llseek to no_llseek	2009-12-16 07:19:59 -08:00
epca.c	tty: const: constify remaining tty_operations	2009-12-11 15:18:03 -08:00
epca.h	…
epcaconfig.h	…
generic_nvram.c	…
generic_serial.c	…
genrtc.c	…
hangcheck-timer.c	…
hpet.c	…
hvc_beat.c	Merge branch 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6	2010-02-25 15:38:37 -08:00
hvc_console.c	hvc_console: fix test on unsigned in hvc_console_print()	2010-03-02 14:43:13 -08:00
hvc_console.h	hvc_console: make the ops pointer const.	2010-02-24 14:22:32 +10:30
hvc_irq.c	…
hvc_iseries.c	hvc_console: make the ops pointer const.	2010-02-24 14:22:32 +10:30
hvc_iucv.c	hvc_console: make the ops pointer const.	2010-02-24 14:22:32 +10:30
hvc_rtas.c	hvc_console: make the ops pointer const.	2010-02-24 14:22:32 +10:30
hvc_udbg.c	hvc_console: make the ops pointer const.	2010-02-24 14:22:32 +10:30
hvc_vio.c	hvc_console: make the ops pointer const.	2010-02-24 14:22:32 +10:30
hvc_xen.c	hvc_console: make the ops pointer const.	2010-02-24 14:22:32 +10:30
hvcs.c	…
hvsi.c	…
i8k.c	…
isicom.c	tty: declare MODULE_FIRMWARE in various drivers	2010-03-02 14:43:15 -08:00
istallion.c	tty: istallion: tty port open/close methods	2009-12-11 15:18:06 -08:00
keyboard.c	Input: add match() method to input hanlders	2010-02-04 00:25:19 -08:00
lp.c	lp: move compat_ioctl handling into lp.c	2009-12-10 22:55:36 +01:00
mbcs.c	…
mbcs.h	…
mem.c	devmem: fix kmem write bug on memory holes	2010-02-02 18:11:22 -08:00
misc.c	drivers/char/misc.c: use bitmap/bitops functions for dynamic minor number allocation	2009-12-15 08:53:27 -08:00
mmtimer.c	…
moxa.c	tty: declare MODULE_FIRMWARE in various drivers	2010-03-02 14:43:15 -08:00
moxa.h	…
mspec.c	…
mxser.c	tty: char: mxser, remove unnecessary tty test	2010-03-02 14:43:12 -08:00
mxser.h	…
n_hdlc.c	…
n_r3964.c	…
n_tty.c	…
nozomi.c	tty: Fix up char drivers request_room usage	2010-03-02 14:43:22 -08:00
nsc_gpio.c	…
nvram.c	Merge branches 'futexes-for-linus', 'irq-core-for-linus' and 'bkl-drivers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip	2010-03-01 08:51:52 -08:00
nwbutton.c	…
nwbutton.h	…
nwflash.c	ARM: add missing include to nwflash.c	2009-12-19 23:36:00 +00:00
pc8736x_gpio.c	…
ppdev.c	…
ps3flash.c	…
pty.c	tty: push the BKL down into the handlers a bit	2009-12-11 15:18:08 -08:00
random.c	random: Remove unused inode variable	2010-02-02 06:50:27 +11:00
raw.c	…
riscom8.c	tty: riscom8: switch to the tty_port_open API	2009-12-11 15:18:06 -08: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	tty: Fix up char drivers request_room usage	2010-03-02 14:43:22 -08:00
snsc.c	…
snsc.h	…
snsc_event.c	…
sonypi.c	sony_pi: Remove the BKL from open and ioctl	2010-01-04 12:31:20 -08:00
specialix.c	tty: Fix up char drivers request_room usage	2010-03-02 14:43:22 -08:00
specialix_io8.h	…
stallion.c	tty: stallion: Convert to the tty_port_open/close methods	2009-12-11 15:18:06 -08:00
sx.c	…
sx.h	…
sxboards.h	…
sxwindow.h	…
synclink.c	Char: synclink, remove unnecessary checks	2010-03-02 14:43:16 -08:00
synclink_gt.c	serial: synclink_gt: dropped transmit data bugfix	2010-03-02 14:43:08 -08:00
synclinkmp.c	…
sysrq.c	oom-kill: fix NUMA constraint check with nodemask	2009-12-16 07:19:57 -08:00
tb0219.c	…
tlclk.c	…
toshiba.c	tosh: Use non bkl ioctl	2010-01-04 12:31:21 -08:00
tty_audit.c	…
tty_buffer.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6	2010-03-03 08:48:58 -08:00
tty_io.c	Fix race in tty_fasync() properly	2010-02-07 10:26:01 -08:00
tty_ioctl.c	…
tty_ldisc.c	tty: Fix the ldisc hangup race	2010-03-02 14:43:22 -08:00
tty_port.c	tty: tty_port: Add a kref object to the tty port	2009-12-11 15:18:07 -08:00
uv_mmtimer.c	x86, UV: Fix RTC latency bug by reading replicated cachelines	2010-01-27 11:33:53 +01:00
vc_screen.c	…
viotape.c	…
virtio_console.c	virtio: console: Fill ports' entire in_vq with buffers	2010-02-24 14:23:06 +10:30
vme_scc.c	m68k: vme_scc - __init annotations	2010-02-27 18:27:14 +01:00
vt.c	vt: make the default cursor shape configurable	2009-12-16 07:19:57 -08:00
vt_ioctl.c	tty: Add a new VT mode which is like VT_PROCESS but doesn't require a VT_RELDISP ioctl call	2010-03-02 14:43:23 -08:00