Linus Torvalds e15daf6cdf 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: (25 commits) drm/radeon/kms: Convert R520 to new init path and associated cleanup drm/radeon/kms: Convert RV515 to new init path and associated cleanup drm: fix radeon DRM warnings when !CONFIG_DEBUG_FS drm: fix drm_fb_helper warning when !CONFIG_MAGIC_SYSRQ drm/r600: fix memory leak introduced with 64k malloc avoidance fix. drm/kms: make fb helper work for all drivers. drm/radeon/r600: fix offset handling in CS parser drm/radeon/kms/r600: fix forcing pci mode on agp cards drm/radeon/kms: fix for the extra pages copying. drm/radeon/kms/r600: add support for vline relocs drm/radeon/kms: fix some bugs in vline reloc drm/radeon/kms/r600: clamp vram to aperture size drm/kms: protect against fb helper not being created. drm/r600: get values from the passed in IB not the copy. drm: create gitignore file for radeon drm/radeon/kms: remove unneeded master create/destroy functions. drm/kms: start adding command line interface using fb. fb: change rules for global rules match. drm/radeon/kms: don't require up to 64k allocations. (v2) drm/radeon/kms: enable dac load detection by default. ... Trivial conflicts in drivers/gpu/drm/radeon/radeon_asic.h due to adding '->vga_set_state' function pointers.		2009-09-30 08:03:00 -07:00
..
accessibility
acpi	ACPI: kill "unused variable ‘i’" warning	2009-09-27 11:58:36 -07:00
amba
ata
atm
auxdisplay
base
block	Merge git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus	2009-09-23 09:23:45 -07:00
bluetooth
cdrom	sysctl: remove "struct file *" argument of ->proc_handler	2009-09-24 07:21:04 -07:00
char	Merge branch 'omap-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6	2009-09-30 07:58:25 -07:00
clocksource
connector
cpufreq
cpuidle
crypto
dca
dio
dma
edac	edac: core: remove completion-wait for complete with rcu_barrier	2009-09-24 07:21:05 -07:00
eisa
firewire	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6	2009-09-23 09:43:22 -07:00
firmware
gpio	Merge branch 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging	2009-09-23 09:30:48 -07:00
gpu	Merge branch 'drm-next' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6	2009-09-30 08:03:00 -07:00
hid
hwmon	Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging	2009-09-23 15:20:16 -07:00
i2c	ACPI: i2c-scmi: don't use acpi_device_uid()	2009-09-26 01:42:07 -04:00
ide	Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6	2009-09-23 09:32:11 -07:00
idle
ieee1394	const: mark struct vm_struct_operations	2009-09-27 11:39:25 -07:00
ieee802154
infiniband	const: mark struct vm_struct_operations	2009-09-27 11:39:25 -07:00
input	input: fix build failures caused by Kconfig Winbond WPCD376I Consumer IR hardware driver Kconfig entry	2009-09-24 07:20:56 -07:00
isdn
leds	Merge branch 'for-linus' of git://git.o-hand.com/linux-rpurdie-leds	2009-09-26 10:50:47 -07:00
lguest	Merge git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus	2009-09-23 09:23:45 -07:00
macintosh	Merge branch 'for-linus' of git://git.o-hand.com/linux-rpurdie-leds	2009-09-26 10:50:47 -07:00
mca
md
media	const: mark struct vm_struct_operations	2009-09-27 11:39:25 -07:00
memstick	memstick: move dev_dbg	2009-09-24 07:21:05 -07:00
message
mfd	mfd/gpio: add a GPIO interface to the UCB1400 MFD chip driver via gpiolib	2009-09-23 07:39:48 -07:00
misc	const: mark struct vm_struct_operations	2009-09-27 11:39:25 -07:00
mmc	Merge branch 'origin' into for-linus	2009-09-24 21:22:33 +01:00
mtd	Merge branch 'for-linus' of git://git.monstr.eu/linux-2.6-microblaze	2009-09-24 09:01:44 -07:00
net	headers: kref.h redux	2009-09-26 10:17:19 -07:00
nubus
of	of: remove "stm,m25p40" alias	2009-09-23 07:39:43 -07:00
oprofile	cpumask: use zalloc_cpumask_var() where possible	2009-09-24 09:34:24 +09:30
parisc
parport	sysctl: remove "struct file *" argument of ->proc_handler	2009-09-24 07:21:04 -07:00
pci	ACPICA: fixup after acpi_get_object_info() change	2009-09-25 14:24:22 -04:00
pcmcia	Merge branch 'origin' into for-linus	2009-09-24 21:22:33 +01:00
platform	thinkpad-acpi: fix CONFIG_THINKPAD_ACPI_HOTKEY_POLL build problem	2009-09-27 02:13:06 -04:00
pnp	ACPI: remove acpi_device.flags.hardware_id	2009-09-25 15:09:48 -04:00
power
pps
ps3
rapidio
regulator
rtc	Merge branch 'origin' into for-linus	2009-09-24 21:22:33 +01:00
s390	headers: utsname.h redux	2009-09-23 18:13:10 -07:00
sbus
scsi	const: mark struct vm_struct_operations	2009-09-27 11:39:25 -07:00
serial	Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc	2009-09-24 17:22:31 -07:00
sfi
sh
sn
spi	Merge branch 'origin' into for-linus	2009-09-24 21:22:33 +01:00
ssb	ssb/sdio: fix printk format warnings	2009-09-23 11:35:41 -04:00
staging	Merge branch 'master' of /home/davem/src/GIT/linux-2.6/	2009-09-24 15:13:11 -07:00
tc
telephony
thermal
uio	const: mark struct vm_struct_operations	2009-09-27 11:39:25 -07:00
usb	tty: Fix regressions caused by commit b50989dc	2009-09-27 13:35:16 -07:00
uwb
video	Merge branch 'drm-next' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6	2009-09-30 08:03:00 -07:00
virtio
vlynq	drivers/vlynq/vlynq.c: fix resource size off by 1 error	2009-09-24 07:21:05 -07:00
w1
watchdog	[WATCHDOG] Add support for the Avionic Design Xanthos watchdog timer.	2009-09-25 08:38:16 +00:00
xen
zorro
Kconfig
Makefile	Merge git://git.infradead.org/mtd-2.6	2009-09-23 10:07:49 -07:00