kernel-hacking-2024-linux-s.../arch/s390
David S. Miller 143c905494 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
	drivers/net/ethernet/intel/i40e/i40e_main.c
	drivers/net/macvtap.c

Both minor merge hassles, simple overlapping changes.

Signed-off-by: David S. Miller <davem@davemloft.net>
2013-12-18 16:42:06 -05:00
..
appldata
boot s390/boot: Install bzImage as default kernel image 2013-11-15 14:08:36 +01:00
configs
crypto crypto: s390 - Fix aes-xts parameter corruption 2013-11-28 22:25:16 +08:00
hypfs
include Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2013-12-18 16:42:06 -05:00
kernel s390/time,vdso: fix clock_gettime for CLOCK_MONOTONIC 2013-12-02 18:15:25 +01:00
kvm Here are the 3.13 KVM changes. There was a lot of work on the PPC 2013-11-15 13:51:36 +09:00
lib s390/uaccess: add missing page table walk range check 2013-11-25 09:15:38 +01:00
math-emu
mm s390: handle pgtable_page_ctor() fail 2013-11-15 09:32:18 +09:00
net
oprofile
pci s390/pci: implement hotplug notifications 2013-11-15 14:08:42 +01:00
defconfig
Kbuild
Kconfig s390: increase CONFIG_NR_CPUS limit 2013-12-02 15:31:08 +01:00
Kconfig.debug
Makefile