drm: merge in Linus mainline

N: Randolph Chung

E: tausq@debian.org

D: Linux/PA-RISC hacker

S: Los Altos, CA 94022

S: USA

S: Hong Kong

N: Juan Jose Ciarlante

W: http://juanjox.kernelnotes.org/

S: Brazil

N: Kumar Gala

E: kumar.gala@freescale.com

E: galak@kernel.crashing.org

D: Embedded PowerPC 6xx/7xx/74xx/82xx/83xx/85xx support

S: Austin, Texas 78729

S: USA

S: 10200 Prague 10, Hostivar

S: Czech Republic

N: Thibaut Varene

E: T-Bone@parisc-linux.org

W: http://www.parisc-linux.org/

P: 1024D/B7D2F063 E67C 0D43 A75E 12A5 BB1C  FA2F 1E32 C3DA B7D2 F063

D: PA-RISC port minion, PDC and GSCPS2 drivers, debuglocks and other bits

D: Some bits in an ARM port, S1D13XXX FB driver, random patches here and there

D: AD1889 sound driver

S: Paris, France

N: Heikki Vatiainen

E: hessu@cs.tut.fi

D: Co-author of Multi-Protocol Over ATM (MPOA), some LANE hacks

	- info for PCI drivers using DMA portably across all platforms.

DocBook/

	- directory with DocBook templates etc. for kernel documentation.

HOWTO

	- The process and procedures of how to do Linux kernel development.

IO-mapping.txt

	- how to access I/O mapped memory from within device drivers.

IPMI.txt

	- info on hardware/driver for specialix IO8+ multiport serial card.

spinlocks.txt

	- info on using spinlocks to provide exclusive access in kernel.

stable_api_nonsense.txt

	- info on why the kernel does not have a stable in-kernel api or abi.

stable_kernel_rules.txt

	- rules and procedures for the -stable kernel releases.

stallion.txt

	- info on using the Stallion multiport serial driver.

svga.txt

#                        +--> DIR=file  (htmldocs)

#                        +--> man/      (mandocs)

# for PDF and PS output you can choose between xmlto and docbook-utils tools

PDF_METHOD	= $(prefer-db2x)

PS_METHOD	= $(prefer-db2x)

###

# The targets that may be used.

.PHONY:	xmldocs sgmldocs psdocs pdfdocs htmldocs mandocs installmandocs

C-procfs-example2 = $(addprefix $(obj)/,$(C-procfs-example))

$(obj)/procfs-guide.xml: $(C-procfs-example2)

###

# Rules to generate postscript, PDF and HTML

# db2html creates a directory. Generate a html file used for timestamp

notfoundtemplate = echo "*** You have to install docbook-utils or xmlto ***"; \

		   exit 1

db2xtemplate = db2TYPE -o $(dir $@) $<

xmltotemplate = xmlto TYPE $(XMLTOFLAGS) -o $(dir $@) $<

# determine which methods are available

ifeq ($(shell which db2ps >/dev/null 2>&1 && echo found),found)

	use-db2x = db2x

	prefer-db2x = db2x

else

	use-db2x = notfound

	prefer-db2x = $(use-xmlto)

endif

ifeq ($(shell which xmlto >/dev/null 2>&1 && echo found),found)

	use-xmlto = xmlto

	prefer-xmlto = xmlto

else

	use-xmlto = notfound

	prefer-xmlto = $(use-db2x)

endif

quiet_cmd_db2ps = XMLTO    $@

      cmd_db2ps = xmlto ps $(XMLTOFLAGS) -o $(dir $@) $<

# the commands, generated from the chosen template

quiet_cmd_db2ps = PS      $@

      cmd_db2ps = $(subst TYPE,ps, $($(PS_METHOD)template))

%.ps : %.xml

	@(which xmlto > /dev/null 2>&1) || \

	 (echo "*** You need to install xmlto ***"; \

	  exit 1)

	$(call cmd,db2ps)

quiet_cmd_db2pdf = XMLTO   $@

      cmd_db2pdf = xmlto pdf $(XMLTOFLAGS) -o $(dir $@) $<

quiet_cmd_db2pdf = PDF      $@

      cmd_db2pdf = $(subst TYPE,pdf, $($(PDF_METHOD)template))

%.pdf : %.xml

	@(which xmlto > /dev/null 2>&1) || \

	 (echo "*** You need to install xmlto ***"; \

	  exit 1)

	$(call cmd,db2pdf)

quiet_cmd_db2html = XMLTO  $@

quiet_cmd_db2html = HTML   $@

      cmd_db2html = xmlto xhtml $(XMLTOFLAGS) -o $(patsubst %.html,%,$@) $< && \

		echo '<a HREF="$(patsubst %.html,%,$(notdir $@))/index.html"> \

         Goto $(patsubst %.html,%,$(notdir $@))</a><p>' > $@

	@if [ ! -z "$(PNG-$(basename $(notdir $@)))" ]; then \

            cp $(PNG-$(basename $(notdir $@))) $(patsubst %.html,%,$@); fi

quiet_cmd_db2man = XMLTO   $@

quiet_cmd_db2man = MAN     $@

      cmd_db2man = if grep -q refentry $<; then xmlto man $(XMLTOFLAGS) -o $(obj)/man $< ; gzip -f $(obj)/man/*.9; fi

%.9 : %.xml

	@(which xmlto > /dev/null 2>&1) || \

     <sect1><title>Kernel utility functions</title>

!Iinclude/linux/kernel.h

<!-- This needs to clean up to make kernel-doc happy

X!Ekernel/printk.c

 -->

!Ekernel/printk.c

!Ekernel/panic.c

!Ekernel/sys.c

!Ekernel/rcupdate.c

     <sect1><title>Driver Support</title>

!Enet/core/dev.c

!Enet/ethernet/eth.c

!Einclude/linux/etherdevice.h

!Enet/core/wireless.c

!Iinclude/linux/etherdevice.h

<!-- FIXME: Removed for now since no structured comments in source

X!Enet/core/wireless.c

-->

     </sect1>

     <sect1><title>Synchronous PPP</title>

!Edrivers/net/wan/syncppp.c

  <chapter id="blkdev">

     <title>Block Devices</title>

!Edrivers/block/ll_rw_blk.c

!Eblock/ll_rw_blk.c

  </chapter>

  <chapter id="miscdev">

<param name="chunk.quietly">1</param>

<param name="funcsynopsis.style">ansi</param>

<param name="funcsynopsis.tabular.threshold">80</param>

<!-- <param name="paper.type">A4</param> -->

</stylesheet>