David S. Miller 71a83a6db6 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/ethernet/rocker/rocker.c The rocker commit was two overlapping changes, one to rename the ->vport member to ->pport, and another making the bitmask expression use '1ULL' instead of plain '1'. Signed-off-by: David S. Miller <davem@davemloft.net>		2015-03-03 21:16:48 -05:00
..
appldata	s390: appldata: drop owner assignment from platform_drivers	2014-10-20 16:20:13 +02:00
boot	s390/sclp: fix declaration of _sclp_print_early()	2015-01-08 10:02:51 +01:00
configs	s390: update default configuration	2015-01-22 12:16:09 +01:00
crypto	s390/crypto: remove 'const' to avoid compiler warnings	2015-01-08 10:02:53 +01:00
hypfs	VFS: (Scripted) Convert S_ISLNK/DIR/REG(dentry->d_inode) to d_is_*(dentry)	2015-02-22 11:38:41 -05:00
include	mm: add missing __PAGETABLE_{PUD,PMD}_FOLDED defines	2015-02-28 09:57:51 -08:00
kernel	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-03-03 21:16:48 -05:00
kvm	Fairly small update, but there are some interesting new features.	2015-02-13 09:55:09 -08:00
lib	s390/spinlock: add compare-and-delay to lock wait loops	2015-01-23 15:17:04 +01:00
math-emu	s390: fix save and restore of the floating-point-control register	2013-10-24 17:17:11 +02:00
mm	s390/mm: align 64-bit PIE binaries to 4GB	2015-02-19 10:36:32 +01:00
net	s390/bpf: Zero extend parameters before calling C function	2015-01-15 11:10:41 +01:00
oprofile	s390: Replace __get_cpu_var uses	2014-08-26 13:45:52 -04:00
pci	OK, this has the big virtio 1.0 implementation, as specified by OASIS.	2015-02-18 09:24:01 -08:00
defconfig	s390: update default configuration	2015-01-22 12:16:09 +01:00
Kbuild	s390/pci: base support	2012-11-30 15:40:45 +01:00
Kconfig	s390/smp: increase maximum value of NR_CPUS to 512	2015-01-30 09:31:13 +01:00
Kconfig.debug	Kconfig: consolidate CONFIG_DEBUG_STRICT_USER_COPY_CHECKS	2013-04-30 17:04:09 -07:00
Makefile	s390/ftrace: hotpatch support for function tracing	2015-01-29 09:19:25 +01:00