David S. Miller 53af53ae83 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: include/linux/netdevice.h net/core/sock.c Trivial merge issues. Removal of "extern" for functions declaration in netdevice.h at the same time "const" was added to an argument. Two parallel line additions in net/core/sock.c Signed-off-by: David S. Miller <davem@davemloft.net>		2013-10-08 23:07:53 -04:00
..
appldata	s390/appldata_net_sum: do not use static data	2013-06-26 21:10:31 +02:00
boot	s390: add support for LZ4-compressed kernel	2013-07-26 13:25:19 +02:00
crypto	s390/crypto: Don't panic after crypto instruction failures	2012-11-23 11:14:27 +01:00
hypfs	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs	2013-09-05 08:50:26 -07:00
include	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2013-10-01 17:06:14 -04:00
kernel	s390/vmcore: use vmcore for zfcpdump	2013-09-11 15:59:15 -07:00
kvm	Merge branch 'next' of git://git.kernel.org/pub/scm/virt/kvm/kvm	2013-09-04 18:15:06 -07:00
lib	s390/time: return with irqs disabled from psw_idle	2013-08-28 09:19:23 +02:00
math-emu	s390/comments: unify copyright messages and remove file names	2012-07-20 11:15:04 +02:00
mm	arch: mm: pass userspace fault flag to generic fault handler	2013-09-12 15:38:01 -07:00
net	net: fix unsafe set_memory_rw from softirq	2013-10-07 15:16:45 -04:00
oprofile	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux	2013-09-11 08:36:03 -07:00
pci	s390/pci: use virtual memory for iommu bitmap	2013-08-30 08:57:24 +02:00
Kbuild	s390/pci: base support	2012-11-30 15:40:45 +01:00
Kconfig	s390: enable ARCH_USE_CMPXCHG_LOCKREF	2013-09-28 12:46:29 +02:00
Kconfig.debug	Kconfig: consolidate CONFIG_DEBUG_STRICT_USER_COPY_CHECKS	2013-04-30 17:04:09 -07:00
Makefile	s390: remove small stack config option	2013-04-26 09:07:08 +02:00
defconfig	s390: update defconfig	2013-09-04 17:19:01 +02:00