David S. Miller 95f873f2ff Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: arch/arm/boot/dts/imx6sx-sdb.dts net/sched/cls_bpf.c Two simple sets of overlapping changes. Signed-off-by: David S. Miller <davem@davemloft.net>		2015-01-27 16:59:56 -08:00
..
boot	microblaze: Move DTS file to common location at boot/dts folder	2014-04-07 13:45:19 +02:00
configs	microblaze: Enable SERIAL_OF_PLATFORM	2014-06-04 06:59:46 +02:00
include	Microblaze patches for 3.19-rc1	2014-12-17 09:54:05 -08:00
kernel	microblaze: include the new timecounter header.	2015-01-02 16:47:36 -05:00
lib	microblaze: Change libgcc-style functions from lib-y to obj-y	2014-07-18 14:26:09 +02:00
mm	microblaze: Fix mmap for cache coherent memory	2014-12-17 12:59:59 +01:00
oprofile	microblaze: Core oprofile configs and hooks	2009-12-14 08:45:07 +01:00
pci	microblaze/PCI: Clip bridge windows to fit in upstream windows	2015-01-16 10:04:43 -06:00
Kconfig	gcov: enable GCOV_PROFILE_ALL from ARCH Kconfigs	2014-12-13 12:42:51 -08:00
Kconfig.debug	microblaze: remove obsolete DEBUG_BOOTMEM	2011-01-10 09:29:51 +01:00
Kconfig.platform	microblaze: Remove platform folder	2014-04-07 13:45:21 +02:00
Makefile	microblaze: Remove platform folder	2014-04-07 13:45:21 +02:00