David S. Miller c5e40ee287 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: net/bridge/br_mdb.c br_mdb.c conflict was a function call being removed to fix a bug in 'net' but whose signature was changed in 'net-next'. Signed-off-by: David S. Miller <davem@davemloft.net>		2015-07-23 00:41:16 -07:00
..
appldata	s390: appldata: drop owner assignment from platform_drivers	2014-10-20 16:20:13 +02:00
boot	s390: remove "64" suffix from a couple of files	2015-03-25 11:49:34 +01:00
configs	s390: new default configuration	2015-06-25 09:39:25 +02:00
crypto	Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6	2015-05-22 14:26:36 -07:00
hypfs	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs	2015-07-04 19:36:06 -07:00
include	mm: clean up per architecture MM hook header files	2015-07-17 16:39:53 -07:00
kernel	s390: adapt entry.S to the move of thread_struct	2015-07-20 13:22:18 +02:00
kvm	The bulk of the changes here is for x86. And for once it's not	2015-06-24 09:36:49 -07:00
lib	s390: remove "64" suffix from mem64.S and swsusp_asm64.S	2015-03-25 11:49:51 +01:00
mm	revert "s390/mm: make hugepages_supported a boot time decision"	2015-07-17 16:39:52 -07:00
net	bpf: introduce bpf_skb_vlan_push/pop() helpers	2015-07-20 20:52:31 -07:00
oprofile	s390/oprofile: fix compile error	2015-07-01 09:34:39 +02:00
pci	s390/pci: improve handling of hotplug event 0x301	2015-06-18 15:45:54 +02:00
Kbuild	s390: remove 31 bit support	2015-03-25 11:49:33 +01:00
Kconfig	s390/bpf: add dependency to z196 features	2015-04-23 16:55:50 +02:00
Kconfig.debug	Kconfig: consolidate CONFIG_DEBUG_STRICT_USER_COPY_CHECKS	2013-04-30 17:04:09 -07:00
Makefile	s390: remove 31 bit support	2015-03-25 11:49:33 +01:00
defconfig	s390: new default configuration	2015-06-25 09:39:25 +02:00