Eric Anholt 2bd34f6ca8 Merge remote branch 'origin/master' into drm-intel-next ...

This resolves the conflict in the EDP code, which has been rather
popular to hack on recently.

Conflicts:
	drivers/gpu/drm/i915/intel_dp.c

2010-08-01 19:34:47 -07:00

..

acpi

ACPI: skip checking BM_STS if the BIOS doesn't ask for it

2010-07-22 16:54:27 -04:00

asm-generic

Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc

2010-07-23 13:26:16 -07:00

crypto

…

drm

Merge branch 'drm-radeon-next' of ../drm-radeon-next into drm-core-next

2010-08-02 10:24:46 +10:00

keys

…

linux

NFS: Fix a typo in include/linux/nfs_fs.h

2010-08-01 15:10:01 -07:00

math-emu

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

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

media

V4L/DVB: tuner: Add a definition for the Philips FQ1236 MK5 NTSC tuner

2010-07-08 16:49:53 -03:00

mtd

…

net

net sched: fix race in mirred device removal

2010-07-24 21:04:20 -07:00

pcmcia

…

rdma

…

rxrpc

…

scsi

SCSI: implement sd_unlock_native_capacity()

2010-06-02 13:50:04 -04:00

sound

…

trace

Merge branch 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

2010-06-10 09:30:09 -07:00

video

…

xen

…

Kbuild

…