Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 11670d3c authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge intel drm-intel-next branch 

Merge remote branch 'anholt/drm-intel-next' of ../anholt-2.6 into drm-next

Conflicts:
	drivers/gpu/drm/i915/intel_display.c
	drivers/gpu/drm/i915/intel_drv.h
	drivers/gpu/drm/i915/intel_sdvo.c
parents 575dc34e 01dfba93

Documentation/filesystems/9p.txt

+3 −0
Original line number Diff line number Diff line
@@ -123,6 +123,9 @@ available from the same CVS repository. 
There are user and developer mailing lists available through the v9fs project

on sourceforge (http://sourceforge.net/projects/v9fs).



A stand-alone version of the module (which should build for any 2.6 kernel)

is available via (http://github.com/ericvh/9p-sac/tree/master)



News and other information is maintained on SWiK (http://swik.net/v9fs).



Bug reports may be issued through the kernel.org bugzilla

MAINTAINERS

+1 −2
Original line number Diff line number Diff line
@@ -2239,8 +2239,7 @@ S: Maintained 
F:	drivers/media/video/gspca/pac207.c



GSPCA SN9C20X SUBDRIVER

P:	Brian Johnson

M:	brijohn@gmail.com

M:	Brian Johnson <brijohn@gmail.com>

L:	linux-media@vger.kernel.org

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6.git

S:	Maintained

Makefile

+1 −1
Original line number Diff line number Diff line 
VERSION = 2

PATCHLEVEL = 6

SUBLEVEL = 31

EXTRAVERSION = -rc6

EXTRAVERSION = -rc8

NAME = Man-Eating Seals of Antiquity



# *DOCUMENTATION*

arch/arm/configs/kirkwood_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -629,7 +629,7 @@ CONFIG_SCSI_LOWLEVEL=y 
CONFIG_ATA=y

# CONFIG_ATA_NONSTANDARD is not set

CONFIG_SATA_PMP=y

# CONFIG_SATA_AHCI is not set

CONFIG_SATA_AHCI=y

# CONFIG_SATA_SIL24 is not set

CONFIG_ATA_SFF=y

# CONFIG_SATA_SVW is not set

arch/arm/mach-kirkwood/ts219-setup.c

+9 −0
Original line number Diff line number Diff line
@@ -206,6 +206,15 @@ static void __init qnap_ts219_init(void) 


}



static int __init ts219_pci_init(void)

{

   if (machine_is_ts219())

           kirkwood_pcie_init();



   return 0;

}

subsys_initcall(ts219_pci_init);



MACHINE_START(TS219, "QNAP TS-119/TS-219")

	/* Maintainer: Martin Michlmayr <tbm@cyrius.com> */

	.phys_io	= KIRKWOOD_REGS_PHYS_BASE,