Dave Airlie 93bb70e0c0 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into drm-next ...

There was some merge conflicts in -next and they weren't so pretty, so
backmerge now to avoid them.

Conflicts:
	drivers/gpu/drm/i915/i915_gem.c
	drivers/gpu/drm/i915/intel_modes.c

2012-08-27 16:22:20 +10:00

..

media

[media] DocBook: Remove a spurious character

2012-08-11 15:40:35 -03:00

.gitignore

…

80211.tmpl

…

alsa-driver-api.tmpl

…

debugobjects.tmpl

…

device-drivers.tmpl

…

deviceiobook.tmpl

…

drm.tmpl

Documentation: DocBook DRM framework documentation

2012-08-23 12:02:53 +02:00

filesystems.tmpl

Documentation: get rid of write_super

2012-08-04 01:25:20 +04:00

gadget.tmpl

…

genericirq.tmpl

…

kernel-api.tmpl

…

kernel-hacking.tmpl

…

kernel-locking.tmpl

…

kgdb.tmpl

…

libata.tmpl

…

librs.tmpl

…

lsm.tmpl

…

Makefile

…

media_api.tmpl

…

mtdnand.tmpl

…

networking.tmpl

…

rapidio.tmpl

…

regulator.tmpl

…

s390-drivers.tmpl

…

scsi.tmpl

…

sh.tmpl

…

stylesheet.xsl

…

tracepoint.tmpl

…

uio-howto.tmpl

…

usb.tmpl

…

writing_usb_driver.tmpl

…

writing-an-alsa-driver.tmpl

…

z8530book.tmpl

…