Linus Torvalds dfbbe89e19 Merge branch 'drm-next' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6 ... * 'drm-next' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6: (53 commits) drm: detect hdmi monitor by hdmi identifier (v3) drm: drm_fops.c unlock missing on error path drm: reorder struct drm_ioctl_desc to save space on 64 bit builds radeon: add some new pci ids drm: read EDID extensions from monitor drm: Use a little stash on the stack to avoid kmalloc in most DRM ioctls. drm/radeon: add regs required for occlusion queries support drm/i915: check the return value from the copy from user drm/radeon: fix logic in r600_page_table_init() to match ati_gart drm/radeon: r600 ptes are 64-bit, cleanup cleanup function. drm/radeon: don't call irq changes on r600 suspend/resume drm/radeon: fix r600 writeback across suspend/resume drm/radeon: fix r600 writeback setup. drm: fix warnings about new mappings in info code. drm/radeon: NULL noise: drivers/gpu/drm/radeon/radeon_*.c drm/radeon: fix r600 pci mapping calls. drm/radeon: r6xx/r7xx: fix possible oops in r600_page_table_cleanup() radeon: call the correct idle function, logic got inverted. drm/radeon: RS600: fix interrupt handling drm/r600: fix rptr address along lines of previous fixes to radeon. ...		2009-03-30 13:54:50 -07:00
..
accessibility
acpi	Merge branch 'core/percpu' into percpu-cpumask-x86-for-linus-2	2009-03-27 17:28:43 +01:00
amba	amba: struct device - replace bus_id with dev_name(), dev_set_name()	2009-03-24 16:38:22 -07:00
ata	Merge branch 'origin' into devel	2009-03-28 20:29:51 +00:00
atm	atm: fix non-const printk argument	2009-03-21 19:06:51 -07:00
auxdisplay
base	Merge branch 'linus' into core/iommu	2009-03-28 23:05:50 +01:00
block	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k	2009-03-26 16:15:31 -07:00
bluetooth	Bluetooth: Remove some pointless conditionals before kfree_skb()	2009-02-27 06:14:50 +01:00
cdrom
char	Merge branch 'bkl-removal' of git://git.lwn.net/linux-2.6	2009-03-30 11:31:47 -07:00
clocksource	Merge branch 'core/percpu' into percpu-cpumask-x86-for-linus-2	2009-03-27 17:28:43 +01:00
connector
cpufreq	Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq	2009-03-26 11:04:08 -07:00
cpuidle
crypto	Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6	2009-03-26 11:04:34 -07:00
dca	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6	2009-03-23 09:25:58 -07:00
dio	dio: struct device - replace bus_id with dev_name(), dev_set_name()	2009-03-24 16:38:22 -07:00
dma	Merge branch 'origin' into devel	2009-03-28 20:29:51 +00:00
edac	edac: struct device - replace bus_id with dev_name(), dev_set_name()	2009-03-24 16:38:21 -07:00
eisa	Merge branch 'core/percpu' into percpu-cpumask-x86-for-linus-2	2009-03-27 17:28:43 +01:00
firewire	firewire: core: optimize propagation of BROADCAST_CHANNEL	2009-03-24 20:56:52 +01:00
firmware	Merge branch 'linus' into x86/apic	2009-02-22 20:05:19 +01:00
gpio	gpio: struct device - replace bus_id with dev_name(), dev_set_name()	2009-03-24 16:38:23 -07:00
gpu	drm: detect hdmi monitor by hdmi identifier (v3)	2009-03-29 18:31:49 +10:00
hid	Merge branch 'bkl-removal' of git://git.lwn.net/linux-2.6	2009-03-26 16:14:02 -07:00
hwmon	hwmon: (f75375s) Remove unnecessary and confusing initialization	2009-03-12 13:36:39 +01:00
i2c	Merge commit 'origin/master' into next	2009-03-30 14:04:53 +11:00
ide	ide: keep track of number of bytes instead of sectors in struct ide_cmd	2009-03-27 12:46:47 +01:00
idle
ieee1394	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6	2009-03-27 18:33:56 -07:00
infiniband	Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6	2009-03-28 13:30:43 -07:00
input	Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm	2009-03-28 14:03:14 -07:00
isdn	Merge branch 'master' of /home/davem/src/GIT/linux-2.6/	2009-03-26 15:23:24 -07:00
leds	netfilter: x_tables: add LED trigger target	2009-02-20 10:55:14 +01:00
lguest	Merge branch 'core/percpu' into percpu-cpumask-x86-for-linus-2	2009-03-27 17:28:43 +01:00
macintosh
mca	mca: struct device - replace bus_id with dev_name(), dev_set_name()	2009-03-24 16:38:23 -07:00
md	dm crypt: wait for endio to complete before destruction	2009-03-16 17:44:36 +00:00
media	V4L/DVB (11316): saa7191: tuner ops wasn't set.	2009-03-30 12:43:50 -03:00
memstick
message	[SCSI] mpt: fix disable lsi sas to use msi as default	2009-02-22 08:51:07 -06:00
mfd	mfd: struct device - replace bus_id with dev_name(), dev_set_name()	2009-03-24 16:38:23 -07:00
misc	Merge branch 'i2c-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6	2009-03-28 14:04:53 -07:00
mmc	Merge branch 'origin' into devel	2009-03-28 20:29:51 +00:00
mtd	Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm	2009-03-28 14:03:14 -07:00
net	Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus	2009-03-30 10:36:35 -07:00
nubus
of
oprofile
parisc	parisc: sba_iommu: fix build bug when CONFIG_PARISC_AGP=y	2009-03-15 13:36:22 -07:00
parport	m68k: atari - Rename "mfp" to "st_mfp"	2009-02-22 09:23:02 -08:00
pci	Merge branch 'iommu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip	2009-03-30 13:41:00 -07:00
pcmcia	Merge branch 'origin' into devel	2009-03-28 20:29:51 +00:00
platform	Merge branch 'bkl-removal' of git://git.lwn.net/linux-2.6	2009-03-26 16:14:02 -07:00
pnp
power	ds2760_battery.c: fix division by zero	2009-03-12 16:20:23 -07:00
ps3	powerpc/ps3: Make ps3av_set_video_mode mode ID signed	2009-03-11 17:10:17 +11:00
rapidio	rapidio: struct device - replace bus_id with dev_name(), dev_set_name()	2009-03-24 16:38:21 -07:00
regulator
rtc	Merge branch 'origin' into devel	2009-03-28 20:29:51 +00:00
s390	Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6	2009-03-28 13:30:43 -07:00
sbus	sbus: Auto-load openprom module when device opened.	2009-03-13 14:30:08 -07:00
scsi	Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm	2009-03-28 14:03:14 -07:00
serial	Merge commit 'origin/master' into next	2009-03-30 14:04:53 +11:00
sh	maple: fix Error in kernel-doc notation	2009-03-29 08:12:39 -07:00
sn
spi	Merge commit 'origin/master' into next	2009-03-30 14:04:53 +11:00
ssb	b43: Add BCM4307 PCI-ID	2009-03-27 20:13:20 -04:00
staging	Merge branch 'topic/snd_card_new-err' into for-linus	2009-03-24 00:35:35 +01:00
tc	tc: struct device - replace bus_id with dev_name(), dev_set_name()	2009-03-24 16:38:22 -07:00
telephony
thermal
uio	UIO: Take offset into account when determining number of pages that can be mapped	2009-03-24 16:38:25 -07:00
usb	Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm	2009-03-28 14:03:14 -07:00
uwb
video	Merge branch 'origin' into devel	2009-03-28 20:29:51 +00:00
virtio
w1	Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6 into devel	2009-03-25 18:31:35 +00:00
watchdog	Merge commit 'origin/master' into next	2009-03-30 14:04:53 +11:00
xen	Merge branch 'linus' into x86/apic	2009-02-22 20:05:19 +01:00
zorro	zorro: struct device - replace bus_id with dev_name(), dev_set_name()	2009-03-24 16:38:21 -07:00
Kconfig
Makefile	ide/net: flip the order of SATA and network init	2009-03-28 13:06:16 -07:00