Linus Torvalds 94e0fb086f Merge branch 'drm-intel-next' of git://git.kernel.org/pub/scm/linux/kernel/git/anholt/drm-intel ... * 'drm-intel-next' of git://git.kernel.org/pub/scm/linux/kernel/git/anholt/drm-intel: (57 commits) drm/i915: Handle ERESTARTSYS during page fault drm/i915: Warn before mmaping a purgeable buffer. drm/i915: Track purged state. drm/i915: Remove eviction debug spam drm/i915: Immediately discard any backing storage for uneeded objects drm/i915: Do not mis-classify clean objects as purgeable drm/i915: Whitespace correction for madv drm/i915: BUG_ON page refleak during unbind drm/i915: Search harder for a reusable object drm/i915: Clean up evict from list. drm/i915: Add tracepoints drm/i915: framebuffer compression for GM45+ drm/i915: split display functions by chip type drm/i915: Skip the sanity checks if the current relocation is valid drm/i915: Check that the relocation points to within the target drm/i915: correct FBC update when pipe base update occurs drm/i915: blacklist Acer AspireOne lid status ACPI: make ACPI button funcs no-ops if not built in drm/i915: prevent FIFO calculation overflows on 32 bits with high dotclocks drm/i915: intel_display.c handle latency variable efficiently ... Fix up trivial conflicts in drivers/gpu/drm/i915/{i915_dma.c|i915_drv.h}		2009-09-24 10:30:41 -07:00
..
agp	Merge branch 'drm-intel-next' of git://git.kernel.org/pub/scm/linux/kernel/git/anholt/drm-intel	2009-09-24 10:30:41 -07:00
hw_random	virtio: add virtio IDs file	2009-09-23 22:26:32 +09:30
ip2	tty: rewrite the ldisc locking	2009-06-11 08:51:01 -07:00
ipmi	trivial: add __init macro/ fix of __exit macro location in ipmi_poweroff.c	2009-09-21 15:14:58 +02:00
mwave	mwave: fix read buffer overflow	2009-09-24 07:21:03 -07:00
pcmcia	pcmcia: fix read buffer overflow	2009-09-22 07:17:42 -07:00
rio	drivers/char/rio/rioctrl.c: off by one error in rioctrl.c	2009-09-24 07:21:03 -07:00
tpm	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6	2009-09-23 15:18:57 -07:00
xilinx_hwicap	xilinx_hwicap: remove improper wording in license statement	2008-12-17 11:23:07 -08:00
.gitignore
amiserial.c	headers: smp_lock.h redux	2009-07-12 12:22:34 -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_jtag_comm.c	bfin_jtag_comm: clean up printk usage	2009-06-22 11:32:23 -07:00
bfin-otp.c	bfin-otp: add writing support	2009-09-24 07:21:03 -07:00
briq_panel.c
bsr.c	powerpc/BSR: Fix BSR to allow mmap of small BSR on 64k kernel	2009-06-26 14:37:26 +10:00
cd1865.h
ChangeLog
consolemap.c	consolemap: indentation & braces disagree - reindent	2009-01-06 15:59:30 -08:00
cp437.uni
cs5535_gpio.c
cyclades.c	serial: move delta_msr_wait into the tty_port	2009-09-19 13:13:31 -07:00
defkeymap.c_shipped
defkeymap.map
digi1.h
digiFep1.h
digiPCI.h
ds1302.c
ds1620.c
dsp56k.c
dtlk.c	dtlk: off by one in {read,write}_tts()	2009-06-19 16:46:06 -07:00
efirtc.c
epca.c	trivial: remove unnecessary semicolons	2009-09-21 15:14:58 +02:00
epca.h
epcaconfig.h
esp.c	serial: move delta_msr_wait into the tty_port	2009-09-19 13:13:31 -07:00
generic_nvram.c	powerpc/nvram: Enable use Generic NVRAM driver for different size chips	2009-09-11 16:02:11 +10:00
generic_serial.c	tty: Remove some pointless casts	2009-01-02 10:19:40 -08:00
genrtc.c
hangcheck-timer.c
hpet.c	hpet: hpet driver periodic timer setup bug fixes	2009-09-24 07:21:03 -07:00
hvc_beat.c	powerpc/cell: Use correct types in beat files	2009-01-08 16:25:16 +11:00
hvc_console.c	hvc_console: Drop unnecessary NULL test	2009-08-20 10:29:23 +10:00
hvc_console.h
hvc_irq.c	hvc_console: Call free_irq() only if request_irq() was successful	2009-01-13 14:48:01 +11:00
hvc_iseries.c	drivers/hvc: Add missing __devexit_p()	2009-06-16 14:15:44 +10:00
hvc_iucv.c	[S390] proper use of device register	2009-09-11 10:29:45 +02:00
hvc_rtas.c
hvc_udbg.c
hvc_vio.c	hvc_console: Add __init and __exit to hvc_vio	2009-08-28 14:24:11 +10:00
hvc_xen.c
hvcs.c	Merge commit 'origin/master' into next	2009-06-18 11:16:55 +10:00
hvsi.c	powerpc/hvsi: Avoid calculating possibly-invalid address	2009-08-20 10:29:28 +10:00
i8k.c	i8k: Add Dell Vostro systems	2009-01-02 10:28:32 -08:00
isicom.c	isicom: split the open method for the isicom device	2009-09-19 13:13:27 -07:00
istallion.c	headers: smp_lock.h redux	2009-07-12 12:22:34 -07:00
Kconfig	drivers/char/uv_mmtimer.c: add memory mapped RTC driver for UV	2009-09-24 07:21:03 -07:00
keyboard.c	Input: keyboard - remove warning about raw mode not supported	2009-04-20 21:21:24 -07:00
lp.c
Makefile	drivers/char/uv_mmtimer.c: add memory mapped RTC driver for UV	2009-09-24 07:21:03 -07:00
mbcs.c	[IA64] mbcs: fix printk format warnings	2009-09-15 08:42:00 -07:00
mbcs.h
mem.c	/dev/zero: avoid repeated access_ok() checks	2009-09-24 07:21:03 -07:00
misc.c	seq_file: constify seq_operations	2009-09-23 07:39:29 -07:00
mmtimer.c
moxa.c	headers: smp_lock.h redux	2009-07-12 12:22:34 -07:00
moxa.h
mspec.c
mxser.c	tty: Char: mxser, use THRE for ASPP_OQUEUE ioctl	2009-09-19 13:13:38 -07:00
mxser.h
n_hdlc.c	headers: smp_lock.h redux	2009-07-12 12:22:34 -07:00
n_r3964.c	headers: smp_lock.h redux	2009-07-12 12:22:34 -07:00
n_tty.c	n_tty: move echoctl check and clean up logic	2009-09-19 13:13:34 -07:00
nozomi.c	tty: fix chars_in_buffers	2009-07-20 16:38:43 -07:00
nsc_gpio.c
nvram.c
nwbutton.c
nwbutton.h
nwflash.c
pc8736x_gpio.c
ppdev.c	ppdev: reduce kernel log spam	2009-06-18 13:03:54 -07:00
ps3flash.c	ps3flash: Always read chunks of 256 KiB, and cache them	2009-06-15 16:47:27 +10:00
pty.c	pty_write: don't do a tty_wakeup() when the buffers are full	2009-09-18 07:05:58 -07:00
random.c	sysctl: remove "struct file *" argument of ->proc_handler	2009-09-24 07:21:04 -07:00
raw.c	Driver-Core: extend devnode callbacks to provide permissions	2009-09-19 12:50:38 -07:00
riscom8_reg.h
riscom8.c	tty: riscom8, fix tty refcnt	2009-09-19 13:13:37 -07:00
riscom8.h
rocket_int.h	tty: rocketport uses different port flags to everyone else	2009-01-02 10:19:39 -08:00
rocket.c	headers: smp_lock.h redux	2009-07-12 12:22:34 -07:00
rocket.h	tty: rocketport uses different port flags to everyone else	2009-01-02 10:19:39 -08:00
rtc.c	RTC: Remove the BKL.	2009-01-08 16:44:03 -07:00
scc.h	m68k: atari - Rename "mfp" to "st_mfp"	2009-02-22 09:23:02 -08:00
scx200_gpio.c
selection.c	tty: rewrite the ldisc locking	2009-06-11 08:51:01 -07:00
ser_a2232.c	m68k: ser_a2232 - Kill warn_unused_result warnings	2009-01-12 20:56:39 +01:00
ser_a2232.h
ser_a2232fw.ax
ser_a2232fw.h
serial167.c	cleanup console_print()	2009-09-14 17:41:42 -07:00
snsc_event.c
snsc.c
snsc.h
sonypi.c	Rationalize fasync return values	2009-03-16 08:34:35 -06:00
specialix_io8.h
specialix.c	specialix.c: convert nested spin_lock_irqsave to spin_lock	2009-07-20 16:38:43 -07:00
stallion.c	tty: Add carrier processing on close to the tty_port core	2009-06-11 08:50:56 -07:00
sx.c	headers: smp_lock.h redux	2009-07-12 12:22:34 -07:00
sx.h
sxboards.h
sxwindow.h
synclink_gt.c	hdlc: convert to netdev_tx_t	2009-09-01 01:13:31 -07:00
synclink.c	hdlc: convert to netdev_tx_t	2009-09-01 01:13:31 -07:00
synclinkmp.c	hdlc: convert to netdev_tx_t	2009-09-01 01:13:31 -07:00
sysrq.c	perf: Do the big rename: Performance Counters -> Performance Events	2009-09-21 14:28:04 +02:00
tb0219.c	Update Yoichi Yuasa's e-mail address	2009-07-03 15:45:29 +01:00
tlclk.c
toshiba.c
tty_audit.c	tty: remove buffer special casing	2009-06-11 08:51:02 -07:00
tty_buffer.c	pty: avoid forcing 'low_latency' tty flag	2009-07-29 12:15:56 -07:00
tty_io.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6	2009-09-20 15:55:39 -07:00
tty_ioctl.c	tty: vt: use printk_once	2009-09-19 13:13:35 -07:00
tty_ldisc.c	tty-ldisc: get rid of tty_ldisc_try_get() helper function	2009-09-19 13:13:10 -07:00
tty_port.c	TTY: fix typos	2009-09-19 13:13:36 -07:00
uv_mmtimer.c	drivers/char/uv_mmtimer.c: add memory mapped RTC driver for UV	2009-09-24 07:21:03 -07:00
vc_screen.c	vc: create vcs(a) devices for consoles	2009-07-20 16:38:43 -07:00
viotape.c	tape: beyond ARRAY_SIZE of viocd_diskinfo	2009-06-02 10:32:34 +10:00
virtio_console.c	virtio: add virtio IDs file	2009-09-23 22:26:32 +09:30
vme_scc.c	m68k: vme_scc - Kill warn_unused_result warnings	2009-01-12 20:56:38 +01:00
vt_ioctl.c	tty: Power: fix suspend vt regression	2009-09-19 13:13:35 -07:00
vt.c	tty: vt: use printk_once	2009-09-19 13:13:35 -07:00