David S. Miller 1578b0a5e9 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: net/sched/act_police.c net/sched/sch_drr.c net/sched/sch_hfsc.c net/sched/sch_prio.c net/sched/sch_red.c net/sched/sch_tbf.c In net-next the drop methods of the packet schedulers got removed, so the bug fixes to them in 'net' are irrelevant. A packet action unload crash fix conflicts with the addition of the new firstuse timestamp. Signed-off-by: David S. Miller <davem@davemloft.net>		2016-06-10 11:52:24 -07:00
..
alpha	lib/GCD.c: use binary GCD algorithm instead of Euclidean	2016-05-20 17:58:30 -07:00
arc	Revert "ARCv2: spinlock/rwlock/atomics: Delayed retry of failed SCOND with exponential backoff"	2016-06-02 10:59:23 +05:30
arm	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2016-06-10 11:52:24 -07:00
arm64	Merge branch 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2016-06-03 16:12:35 -07:00
avr32	printk/nmi: generic solution for safe printk in NMI	2016-05-20 17:58:30 -07:00
blackfin	printk/nmi: generic solution for safe printk in NMI	2016-05-20 17:58:30 -07:00
c6x	asm-generic patch for 4.7	2016-05-24 15:24:37 -07:00
cris	MTD updates for v4.7:	2016-05-24 11:00:20 -07:00
frv	exit_thread: remove empty bodies	2016-05-20 17:58:30 -07:00
h8300	Merge branch 'hash' of git://ftp.sciencehorizons.net/linux	2016-05-28 16:15:25 -07:00
hexagon	asm-generic patch for 4.7	2016-05-24 15:24:37 -07:00
ia64	Merge branch 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild	2016-05-26 22:01:22 -07:00
m32r	Merge branch 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild	2016-05-26 22:01:22 -07:00
m68k	Merge branch 'hash' of git://ftp.sciencehorizons.net/linux	2016-05-28 16:15:25 -07:00
metag	Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2016-05-25 17:05:40 -07:00
microblaze	Merge branch 'hash' of git://ftp.sciencehorizons.net/linux	2016-05-28 16:15:25 -07:00
mips	Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus	2016-05-28 16:41:39 -07:00
mn10300	Merge branch 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild	2016-05-26 22:01:22 -07:00
nios2	Merge branch 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild	2016-05-26 22:01:22 -07:00
openrisc	asm-generic patch for 4.7	2016-05-24 15:24:37 -07:00
parisc	parisc: Move die_if_kernel() prototype into traps.h header	2016-06-05 08:49:01 +02:00
powerpc	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs	2016-06-07 20:41:36 -07:00
s390	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux	2016-05-31 09:43:24 -07:00
score	asm-generic patch for 4.7	2016-05-24 15:24:37 -07:00
sh	Merge branch 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild	2016-05-26 22:01:22 -07:00
sparc	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc	2016-05-31 22:20:56 -07:00
tile	Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2016-05-25 17:05:40 -07:00
um	Merge branch 'for-linus-4.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml	2016-05-27 18:54:59 -07:00
unicore32	Merge branch 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild	2016-05-26 22:01:22 -07:00
x86	KVM: x86: fix OOPS after invalid KVM_SET_DEBUGREGS	2016-06-02 17:38:50 +02:00
xtensa	Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2016-05-25 17:05:40 -07:00
.gitignore
Kconfig	Merge branch 'hash' of git://ftp.sciencehorizons.net/linux	2016-05-28 16:15:25 -07:00