Commit 78276271 authored by Dave Airlie's avatar Dave Airlie
Browse files

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

* 'drm-radeon-next' of ../drm-radeon-next: (333 commits)
  drm/radeon/kms: trivial code style fixes for audio
  drm/radeon: remove viewport transform from r6xx/r7xx blit emit
  drm/radeon: group r6xx/r7xx newly sequential blit state
  drm/radeon: reorder r6xx/r7xx blit state emit to make more regs sequential
  drm/radeon: r6xx/r7xx move vport clipping to a single packet
  drm/radeon: group r6xx/r7xx sequential blit state
  drm/radeon: remove duplicate state emit in r6xx/r7xx blit
  drm/radeon: add comments to r6xx/r7xx blit state
  drm/radeon/kms/r7xx: add workaround for hw issue with HDP flush
  drm/radeon/kms: remove rs4xx gart limit
  drm: radeon: fix sign bug
  drm/radeon/kms: check/restore sanity before doing anything else with GPU.
  drm/radeon: fall back to GTT if bo creation/validation in VRAM fails.
  drm/radeon/kms: add ioport register access
  drm/radeon/kms: enable HDMI audio on RS600/RS690/RS740
  drm/radeon/kms: track audio engine state, do not use not setup timer
  drm/radeon/kms/r6xx+: add query for tile config (v2)
  drm/radeon/kms: fix CS alignment checking for tiling (v2)
  drm/radeon/kms: add tiling support to the cs checker for r6xx/r7xx
  drm/radeon/kms: Add crtc tiling setup support for evergreen
  ...
parents e190bfe5 219de62a

Documentation/00-INDEX

+4 −2
Original line number Diff line number Diff line
@@ -32,8 +32,6 @@ 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 Linux Intelligent Platform Management Interface (IPMI) Driver.

IRQ-affinity.txt
@@ -84,6 +82,8 @@ blockdev/ 
	- info on block devices & drivers

btmrvl.txt

	- info on Marvell Bluetooth driver usage.

bus-virt-phys-mapping.txt

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

cachetlb.txt

	- describes the cache/TLB flushing interfaces Linux uses.

cdrom/
@@ -168,6 +168,8 @@ initrd.txt 
	- how to use the RAM disk as an initial/temporary root filesystem.

input/

	- info on Linux input device support.

io-mapping.txt

	- description of io_mapping functions in linux/io-mapping.h

io_ordering.txt

	- info on ordering I/O writes to memory-mapped addresses.

ioctl/

Documentation/kernel-parameters.txt

+1 −1
Original line number Diff line number Diff line
@@ -1265,7 +1265,7 @@ and is between 256 and 4096 characters. It is defined in the file 
			If there are multiple matching configurations changing

			the same attribute, the last one is used.



	lmb=debug	[KNL] Enable lmb debug messages.

	memblock=debug	[KNL] Enable memblock debug messages.



	load_ramdisk=	[RAM] List of ramdisks to load from floppy

			See Documentation/blockdev/ramdisk.txt.

Documentation/video4linux/CARDLIST.tuner

+1 −0
Original line number Diff line number Diff line
@@ -82,3 +82,4 @@ tuner=81 - Partsnic (Daewoo) PTI-5NF05 
tuner=82 - Philips CU1216L

tuner=83 - NXP TDA18271

tuner=84 - Sony BTF-Pxn01Z

tuner=85 - Philips FQ1236 MK5

MAINTAINERS

+4 −1
Original line number Diff line number Diff line
@@ -2121,7 +2121,9 @@ M: Mauro Carvalho Chehab <mchehab@redhat.com> 
L:	linux-edac@vger.kernel.org

W:	bluesmoke.sourceforge.net

S:	Maintained

F:	drivers/edac/i7core_edac.c linux/edac_mce.h drivers/edac/edac_mce.c

F:	drivers/edac/i7core_edac.c

F:	drivers/edac/edac_mce.c

F:	include/linux/edac_mce.h



EDAC-I82975X

M:	Ranganathan Desikan <ravi@jetztechnologies.com>
@@ -5334,6 +5336,7 @@ T: git git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6.git 
T:	git git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next-2.6.git

S:	Maintained

F:	arch/sparc/

F:	drivers/sbus



SPARC SERIAL DRIVERS

M:	"David S. Miller" <davem@davemloft.net>

CRA Git | Maintained and supported by SUSTech CRA and CCSE