David S. Miller c4c5551df1 Merge ra.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux ... All conflicts were trivial overlapping changes, so reasonably easy to resolve. Signed-off-by: David S. Miller <davem@davemloft.net>		2018-07-20 21:17:12 -07:00
..
alpha	net: Add a new socket option for a future transmit time.	2018-07-04 22:30:27 +09:00
arc	ARC fixes for 4.18-rc6	2018-07-20 11:33:22 -07:00
arm	Merge ra.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux	2018-07-20 21:17:12 -07:00
arm64	Merge ra.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux	2018-07-20 21:17:12 -07:00
c6x	Merge branch 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2018-06-04 20:27:54 -07:00
h8300	Merge branch 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2018-06-04 20:27:54 -07:00
hexagon	hexagon: drop the unused variable zero_page_mask	2018-06-15 07:55:25 +09:00
ia64	net: Add a new socket option for a future transmit time.	2018-07-04 22:30:27 +09:00
m68k	m68k: fix "bad page state" oops on ColdFire boot	2018-07-02 10:05:13 +10:00
microblaze	Microblaze patches for 4.18-rc3	2018-06-27 09:49:30 -07:00
mips	Merge ra.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux	2018-07-20 21:17:12 -07:00
nds32	nds32: fix build error "relocation truncated to fit: R_NDS32_25_PCREL_RELA" when	2018-07-05 16:13:47 +08:00
nios2	Merge branch 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2018-06-04 20:27:54 -07:00
openrisc	openrisc: entry: Fix delay slot exception detection	2018-07-01 16:48:24 +09:00
parisc	net: Add a new socket option for a future transmit time.	2018-07-04 22:30:27 +09:00
powerpc	Merge ra.kernel.org:/pub/scm/linux/kernel/git/davem/net	2018-07-03 10:29:26 +09:00
riscv	RISC-V: Fix the rv32i kernel build	2018-07-04 14:12:53 -07:00
s390	Merge ra.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux	2018-07-20 21:17:12 -07:00
sh	arch/*: Kconfig: fix documentation for NMI watchdog	2018-06-15 12:48:59 -03:00
sparc	net: Add a new socket option for a future transmit time.	2018-07-04 22:30:27 +09:00
um	Solve a series of broken links for files under Documentation:	2018-06-17 05:25:18 +09:00
unicore32	docs: Fix some broken references	2018-06-15 18:10:01 -03:00
x86	Miscellaneous bugfixes, plus a small patchlet related to Spectre v2.	2018-07-18 11:08:44 -07:00
xtensa	net: Add a new socket option for a future transmit time.	2018-07-04 22:30:27 +09:00
.gitignore
Kconfig	docs: Fix some broken references	2018-06-15 18:10:01 -03:00