Merge ../linux-2.6 (698158c7) · Commits · github.com / kvm-riscv / linux

Documentation/kernel-parameters.txt

+3 −0

Original line number	Diff line number	Diff line
		@@ -2034,6 +2034,9 @@ and is between 256 and 4096 characters. It is defined in the file

		snd-ymfpci= [HW,ALSA]

		softlockup_panic=
		[KNL] Should the soft-lockup detector generate panics.

		sonypi.*= [HW] Sony Programmable I/O Control Device driver
		See Documentation/sonypi.txt

+26 −4

Original line number	Diff line number	Diff line
		@@ -441,10 +441,7 @@ M: spyro@f2s.com
		S: Maintained

		ARM PRIMECELL MMCI PL180/1 DRIVER
		P: Russell King
		M: rmk@arm.linux.org.uk
		L: linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
		S: Maintained
		S: Orphan

		ARM/ADI ROADRUNNER MACHINE SUPPORT
		P: Lennert Buytenhek
		@@ -483,11 +480,28 @@ M: kernel@wantstofly.org
		L: linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
		S: Maintained

		ARM/COMPULAB CM-X270/EM-X270 MACHINE SUPPORT
		P: Mike Rapoport
		M: mike@compulab.co.il
		L: linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
		S: Maintained

		ARM/CORGI MACHINE SUPPORT
		P: Richard Purdie
		M: rpurdie@rpsys.net
		S: Maintained

		ARM/EZX SMARTPHONES (A780, A910, A1200, E680, ROKR E2 and ROKR E6)
		P: Daniel Ribeiro
		M: drwyrm@gmail.com
		P: Stefan Schmidt
		M: stefan@openezx.org
		P: Harald Welte
		M: laforge@openezx.org
		L: openezx-devel@lists.openezx.org (subscribers-only)
		W: http://www.openezx.org/
		S: Maintained

		ARM/GLOMATION GESBC9312SX MACHINE SUPPORT
		P: Lennert Buytenhek
		M: kernel@wantstofly.org
		@@ -575,10 +589,18 @@ L: linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
		S: Maintained

		ARM/TOSA MACHINE SUPPORT
		P: Dmitry Baryshkov
		M: dbaryshkov@gmail.com
		P: Dirk Opfer
		M: dirk@opfer-online.de
		S: Maintained

		ARM/PALMTX SUPPORT
		P: Marek Vasut
		M: marek.vasut@gmail.com
		W: http://hackndev.com
		S: Maintained

		ARM/PLEB SUPPORT
		P: Peter Chubb
		M: pleb@gelato.unsw.edu.au

+1 −0

Original line number	Diff line number	Diff line
		@@ -12,6 +12,7 @@ config ARM
		select RTC_LIB
		select SYS_SUPPORTS_APM_EMULATION
		select HAVE_OPROFILE
		select HAVE_ARCH_KGDB
		select HAVE_KPROBES if (!XIP_KERNEL)
		select HAVE_KRETPROBES if (HAVE_KPROBES)
		select HAVE_FTRACE if (!XIP_KERNEL)

+1 −1

Original line number	Diff line number	Diff line
		@@ -627,7 +627,7 @@ __sa1111_probe(struct device me, struct resource mem, int irq)
		if (!sachip)
		return -ENOMEM;

		sachip->clk = clk_get(me, "GPIO27_CLK");
		sachip->clk = clk_get(me, "SA1111_CLK");
		if (!sachip->clk) {
		ret = PTR_ERR(sachip->clk);
		goto err_free;

0 → 100644

+1614 −0

File added.

Preview size limit exceeded, changes collapsed.