Linus Torvalds bf4f42b441 Merge branch 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6 ... * 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6: (27 commits) drm/radeon/kms: remove rv100 bios connector quirk drm/radeon/kms/pm: fix power state indexing on igp chips in dynpm mode DRM / radeon / KMS: Fix hibernation regression related to radeon PM (was: Re: [Regression, post-2.6.34] Hibernation broken on machines with radeon/KMS and r300) drm/radeon/kms/igp: fix possible divide by 0 in bandwidth code (v2) drm/radeon: add quirk to make HP nx6125 laptop resume. drm/radeon/kms: add some missing regs to evergreen gpu init drm/radeon/kms: fix typos in evergreen command checker drm/radeon/kms: avoid oops on mac r4xx cards fb: fix colliding defines for fb flags. drm/radeon/kms: Force HDP_NONSURF to maximum size drm/radeon/kms: disable frac fb dividers for rs6xx drm/radeon/kms: don't read attempt to read bios from VRAM on unposted GPU. drm/radeon/kms: fix typo in evergreen_gpu_init drm/radeon/kms: return ret in cursor_set failure path drm/ttm: non pooled page allocation should have GFP_USER set drm/radeon/r100/r200: fix calculation of compressed cube maps drm/radeon/r200: handle more hw tex coord types drm/radeon/kms: CS checker texture fixes for r1xx/r2xx/r3xx drm/radeon: add fake RN50 table for powerpc drm/fb: Fix video= mode computation ...		2010-07-01 09:36:49 -07:00
..
agp	agp: add no warn since we have a fallback to vmalloc paths	2010-06-15 11:02:32 +10:00
hw_random	Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm	2010-05-25 12:06:33 -07:00
ip2
ipmi	ipmi: set schedule_timeout_wait() value back to one	2010-06-29 15:29:31 -07:00
mwave
pcmcia	pcmcia: dev_node removal (remaining drivers)	2010-05-10 10:23:16 +02:00
rio
tpm	TPM: ReadPubEK output struct fix	2010-06-15 09:26:28 +10:00
xilinx_hwicap	of: Remove duplicate fields from of_platform_driver	2010-05-22 00:10:40 -06:00
.gitignore
amiserial.c	m68k: amiga - Serial port platform device conversion	2010-05-26 19:51:09 +02:00
apm-emulation.c	drivers: Push down BKL into various drivers	2010-05-17 05:27:41 +02:00
applicom.c	drivers/char/applicom.c: use memdup_user	2010-05-27 09:12:50 -07:00
applicom.h
bfin_jtag_comm.c
bfin-otp.c
briq_panel.c
bsr.c	Merge branch 'master' into for-next	2010-04-23 02:08:44 +02:00
cd1865.h
consolemap.c
cp437.uni
cs5535_gpio.c
cyclades.c
defkeymap.c_shipped
defkeymap.map
digi1.h
digiFep1.h
digiPCI.h
ds1302.c
ds1620.c	drivers: Push down BKL into various drivers	2010-05-17 05:27:41 +02:00
dsp56k.c
dtlk.c	drivers: Push down BKL into various drivers	2010-05-17 05:27:41 +02:00
efirtc.c
epca.c
epca.h
epcaconfig.h
generic_nvram.c	drivers: Push down BKL into various drivers	2010-05-17 05:27:41 +02:00
generic_serial.c
genrtc.c	drivers: Push down BKL into various drivers	2010-05-17 05:27:41 +02:00
hangcheck-timer.c	hangcheck-timer: fix x86_32 bugs	2010-05-25 08:07:02 -07:00
hpet.c	drivers: Push down BKL into various drivers	2010-05-17 05:27:41 +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	hvsi: fix messed up error checking getting state name	2010-05-25 08:07:03 -07:00
i8k.c	procfs: Push down the bkl from ioctl	2010-05-17 03:06:12 +02:00
isicom.c	serial: isicomm: handle running out of slots	2010-05-21 09:34:30 -07:00
istallion.c	tty: Fix regressions in the char driver conversion	2010-04-30 09:20:33 -07:00
Kconfig	ramoops: add HAS_IOMEM dependency	2010-06-04 15:21:44 -07:00
keyboard.c	Input: keyboard - fix formatting issues	2010-04-13 23:26:35 -07:00
lp.c
Makefile	char drivers: RAM oops/panic logger	2010-05-27 09:12:50 -07:00
mbcs.c
mbcs.h
mem.c
misc.c	drivers: misc: pass miscdevice pointer via file private data	2010-05-25 08:07:03 -07:00
mmtimer.c
moxa.c
moxa.h
mspec.c
mxser.c	tty: Fix regressions in the char driver conversion	2010-04-30 09:20:33 -07:00
mxser.h
n_gsm.c	TTY/n_gsm: potential double lock	2010-06-04 13:37:17 -07:00
n_hdlc.c
n_r3964.c
n_tty.c
nozomi.c
nsc_gpio.c
nvram.c	drivers: Push down BKL into various drivers	2010-05-17 05:27:41 +02:00
nwbutton.c
nwbutton.h
nwflash.c	drivers: Push down BKL into various drivers	2010-05-17 05:27:41 +02:00
pc8736x_gpio.c
ppdev.c	drivers/char/ppdev.c: use kasprintf	2010-05-27 09:12:50 -07:00
ps3flash.c	drop unused dentry argument to ->fsync	2010-05-27 22:05:02 -04:00
pty.c
ramoops.c	char drivers: RAM oops/panic logger	2010-05-27 09:12:50 -07:00
random.c	random: simplify fips mode	2010-05-20 19:55:01 +10:00
raw.c	drivers: Push down BKL into various drivers	2010-05-17 05:27:41 +02:00
riscom8_reg.h
riscom8.c	tty: Fix regressions in the char driver conversion	2010-04-30 09:20:33 -07:00
riscom8.h
rocket_int.h
rocket.c
rocket.h
rtc.c
scc.h
scx200_gpio.c
selection.c
ser_a2232.c
ser_a2232.h
ser_a2232fw.ax
ser_a2232fw.h
serial167.c	serial: Tidy REMOTE_DEBUG	2010-05-21 09:34:31 -07:00
snsc_event.c
snsc.c
snsc.h
sonypi.c
specialix_io8.h
specialix.c
stallion.c	tty: Fix regressions in the char driver conversion	2010-04-30 09:20:33 -07:00
sx.c
sx.h
sxboards.h
sxwindow.h
synclink_gt.c
synclink.c
synclinkmp.c
sysrq.c	Input: sysrq - fix "stuck" SysRq mode	2010-06-09 08:13:56 -07:00
tb0219.c
tlclk.c
toshiba.c
tty_audit.c
tty_buffer.c	tty: fix obsolete comment on tty_insert_flip_string_fixed_flag	2010-05-21 09:34:30 -07:00
tty_io.c	tty: Fix unbalanced BKL handling in error path	2010-05-13 12:10:56 -07:00
tty_ioctl.c
tty_ldisc.c
tty_port.c
uv_mmtimer.c
vc_screen.c
viotape.c	of: Always use 'struct device.of_node' to get device node pointer.	2010-05-18 16:10:44 -06:00
virtio_console.c	virtio: console: Fix crash when port is unplugged and blocked for write	2010-06-03 22:39:19 +09:30
vme_scc.c
vt_ioctl.c	vt_ioctl: return -EFAULT on copy_from_user errors	2010-06-04 13:37:18 -07:00
vt.c	Revert "tty: fix a little bug in scrup, vt.c"	2010-06-06 20:44:04 -07:00