Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (e2160156) · Commits · e / devices / android_kernel_fairphone_FP5

Documentation/devicetree/bindings/interrupt-controller/snps,archs-idu-intc.txt

+3 −0

Original line number	Diff line number	Diff line
		@@ -15,6 +15,9 @@ Properties:
		Second cell specifies the irq distribution mode to cores
		0=Round Robin; 1=cpu0, 2=cpu1, 4=cpu2, 8=cpu3

		The second cell in interrupts property is deprecated and may be ignored by
		the kernel.

		intc accessed via the special ARC AUX register interface, hence "reg" property
		is not specified.

+0 −1

Original line number	Diff line number	Diff line
		@@ -10208,7 +10208,6 @@ F: drivers/media/tuners/qt1010*
		QUALCOMM ATHEROS ATH9K WIRELESS DRIVER
		M: QCA ath9k Development <ath9k-devel@qca.qualcomm.com>
		L: linux-wireless@vger.kernel.org
		L: ath9k-devel@lists.ath9k.org
		W: http://wireless.kernel.org/en/users/Drivers/ath9k
		S: Supported
		F: drivers/net/wireless/ath/ath9k/

+2 −2

Original line number	Diff line number	Diff line
		VERSION = 4
		PATCHLEVEL = 10
		SUBLEVEL = 0
		EXTRAVERSION = -rc5
		NAME = Anniversary Edition
		EXTRAVERSION = -rc6
		NAME = Fearless Coyote

		# DOCUMENTATION
		# To see a list of typical targets execute "make help"

+3 −1

Original line number	Diff line number	Diff line
		@@ -26,7 +26,9 @@ static inline void __delay(unsigned long loops)
		" lp 1f \n"
		" nop \n"
		"1: \n"
		: : "r"(loops));
		:
		: "r"(loops)
		: "lp_count");
		}

		extern void __bad_udelay(void);

+7 −7

Original line number	Diff line number	Diff line
		@@ -71,14 +71,14 @@ ENTRY(stext)
		GET_CPU_ID r5
		cmp r5, 0
		mov.nz r0, r5
		#ifdef CONFIG_ARC_SMP_HALT_ON_RESET
		; Non-Master can proceed as system would be booted sufficiently
		jnz first_lines_of_secondary
		#else
		bz .Lmaster_proceed

		; Non-Masters wait for Master to boot enough and bring them up
		jnz arc_platform_smp_wait_to_boot
		#endif
		; Master falls thru
		; when they resume, tail-call to entry point
		mov blink, @first_lines_of_secondary
		j arc_platform_smp_wait_to_boot

		.Lmaster_proceed:
		#endif

		; Clear BSS before updating any globals