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	[media] DocBook: Add a chapter to describe media errors	2011-07-27 17:53:35 -03:00
80211.tmpl	mac80211: remove ieee80211_key_removed	2012-07-09 14:49:15 +02:00
Makefile	MCA: delete all remaining traces of microchannel bus support.	2012-05-17 19:06:13 -04:00
alsa-driver-api.tmpl	ALSA: Move ALSA docbooks to be with the rest of the kernel docbooks	2009-03-09 15:22:59 +01:00
debugobjects.tmpl	debugobjects: Extend to assert that an object is initialized	2011-11-23 18:49:22 +01:00
device-drivers.tmpl	Merge branch 'for-next' of git://gitorious.org/kernel-hsi/kernel-hsi	2012-04-02 09:50:40 -07:00
deviceiobook.tmpl	docbook: change iomap source filename in deviceiobook	2012-01-23 08:44:54 -08:00
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	usb gadget: cdc obex glue	2008-10-17 14:40:53 -07:00
genericirq.tmpl	genirq: Update DocBook comments	2011-04-23 15:56:23 +02:00
kernel-api.tmpl	MCA: delete all remaining traces of microchannel bus support.	2012-05-17 19:06:13 -04:00
kernel-hacking.tmpl	Documentation: Fix typo in multiple files in Documentation	2012-04-16 14:37:13 +02:00
kernel-locking.tmpl	Fix common misspellings	2011-03-31 11:26:23 -03:00
kgdb.tmpl	kgdb,debug_core: add the ability to control the reboot notifier	2012-03-22 15:07:16 -05:00
libata.tmpl	Documentation: Fix typo in multiple files in Documentation	2012-04-16 14:37:13 +02:00
librs.tmpl	…
lsm.tmpl	Add missing section ID to lsm.tmpl	2008-02-07 08:42:16 -08:00
media_api.tmpl	[media] DVB: Point to the generic error chapter	2011-07-27 17:53:37 -03:00
mtdnand.tmpl	mtd: nand: kill NAND_NO_AUTOINCR option	2012-05-13 23:15:38 -05:00
networking.tmpl	wimax: Makefile, Kconfig and docbook linkage for the stack	2009-01-07 10:00:17 -08:00
rapidio.tmpl	docbook: fix rapidio warning	2011-03-27 19:30:19 -07:00
regulator.tmpl	Fix common misspellings	2011-03-31 11:26:23 -03:00
s390-drivers.tmpl	docbook: fix s390 fatal error after header files moved	2008-08-05 16:56:29 -07:00
scsi.tmpl	Documentation: update broken web addresses.	2010-08-04 15:21:40 +02:00
sh.tmpl	sh: clkfwk: Kill off unused clk_set_rate_ex().	2010-11-15 18:25:12 +09:00
stylesheet.xsl	docbook: use IDs as filenames to support multiple books	2010-08-05 13:21:24 -07:00
tracepoint.tmpl	workqueue: Add a workqueue chapter to the tracepoint docbook	2010-08-27 12:27:36 +02:00
uio-howto.tmpl	uio: documentation fixups	2011-11-15 11:14:01 -08:00
usb.tmpl	Fix common misspellings	2011-03-31 11:26:23 -03:00
writing-an-alsa-driver.tmpl	ALSA: module_param: make bool parameters really bool	2011-12-19 10:34:41 +01:00
writing_usb_driver.tmpl	USB: rename usb_buffer_alloc() and usb_buffer_free() users	2010-05-20 13:21:38 -07:00
z8530book.tmpl	Rationalise Randy's address a bit	2008-10-30 11:38:47 -07:00