Eric Anholt 34dc4d4423 Merge remote branch 'origin/master' into drm-intel-next ...

Conflicts:
	drivers/gpu/drm/i915/i915_dma.c
	drivers/gpu/drm/i915/i915_drv.h
	drivers/gpu/drm/radeon/r300.c

The BSD ringbuffer support that is landing in this branch
significantly conflicts with the Ironlake PIPE_CONTROL fix on master,
and requires it to be tested successfully anyway.

2010-05-10 13:36:52 -07:00

..

acpi

…

asm-generic

…

crypto

…

drm

Merge branch 'drm-ttm-unmappable' into drm-core-next

2010-04-20 14:15:09 +10:00

keys

…

linux

i2c-core: Use per-adapter userspace device lists

2010-05-04 11:09:28 +02:00

math-emu

…

media

…

mtd

…

net

net: fix compile error due to double return type in SOCK_DEBUG

2010-05-02 13:42:39 -07:00

pcmcia

pcmcia: pcmcia_dev_present bugfix

2010-04-21 08:09:17 +02:00

rdma

…

rxrpc

…

scsi

…

sound

Merge branch 'fix/asoc' into for-linus

2010-04-07 09:54:41 +02:00

trace

Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block

2010-04-09 11:50:29 -07:00

video

…

xen

…

Kbuild

…