Chris Wilson 5aa7d52aeb Merge branch 'drm-intel-fixes' into drm-intel-next ...

Immediate merge for the conflicting introduction of HAS_COHERENT_RINGS.

Conflicts:
	drivers/gpu/drm/i915/i915_dma.c
	include/drm/i915_drm.h

2010-12-05 10:43:39 +00:00

..

acpi

Merge branch 'misc' into release

2010-10-26 14:51:00 -04:00

asm-generic

asm-generic/stat.h: support 64-bit file time_t for stat()

2010-11-01 15:31:29 -04:00

crypto

Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial

2010-10-24 13:41:39 -07:00

drm

Merge branch 'drm-intel-fixes' into drm-intel-next

2010-12-05 10:43:39 +00:00

keys

DNS: Separate out CIFS DNS Resolver code

2010-08-05 17:17:51 +00:00

linux

Merge branch 'drm-intel-fixes' into drm-intel-next

2010-12-02 23:50:36 +00:00

math-emu

math-emu: correct test for downshifting fraction in _FP_FROM_INT()

2010-07-20 18:45:14 -07:00

media

[media] v4l: Remove module_name argument to the v4l2_i2c_new_subdev* functions

2010-11-22 11:56:26 -02:00

mtd

mtd: Define MLC Flash as a different flash type

2010-10-25 00:50:20 +01:00

net

af_unix: limit recursion level

2010-11-29 09:45:15 -08:00

pcmcia

pcmcia: IOCARD is also required for using IRQs

2010-10-22 08:46:36 +02:00

rdma

IB/core: Add VLAN support for IBoE

2010-10-25 10:20:39 -07:00

rxrpc

net: use __packed annotation

2010-06-03 03:21:52 -07:00

scsi

SCSI host lock push-down

2010-11-16 13:33:23 -08:00

sound

ARM: mach-shmobile: ap4evb: FSI clock use proper process for HDMI

2010-11-24 15:29:56 +09:00

trace

ext4: Add new ext4 inode tracepoints

2010-11-08 13:51:33 -05:00

video

fbdev: da8xx: punt duplicated FBIO_WAITFORVSYNC define

2010-11-16 10:14:22 +09:00

xen

Merge branches 'upstream/core', 'upstream/xenfs' and 'upstream/evtchn' into upstream/for-linus

2010-11-22 12:22:42 -08:00

Kbuild

…