David S. Miller 5f013c9bc7 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/ethernet/altera/altera_sgdma.c net/netlink/af_netlink.c net/sched/cls_api.c net/sched/sch_api.c The netlink conflict dealt with moving to netlink_capable() and netlink_ns_capable() in the 'net' tree vs. supporting 'tc' operations in non-init namespaces. These were simple transformations from netlink_capable to netlink_ns_capable. The Altera driver conflict was simply code removal overlapping some void pointer cast cleanups in net-next. Signed-off-by: David S. Miller <davem@davemloft.net>		2014-05-12 13:19:14 -04:00
..
alpha	Merge git://git.infradead.org/users/eparis/audit	2014-04-12 12:38:53 -07:00
arc	ARC: !PREEMPT: Ensure Return to kernel mode is IRQ safe	2014-04-30 08:21:43 -07:00
arm	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2014-05-12 13:19:14 -04:00
arm64	arm64: Mark the Applied Micro X-Gene SATA controller as DMA coherent	2014-05-03 22:20:35 +01:00
avr32	Char/Misc driver patches for 3.15-rc1	2014-04-01 16:13:21 -07:00
blackfin	blackfin updates for Linux 3.15	2014-04-12 17:26:45 -07:00
c6x	Merge branch 'core-locking-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2014-03-31 10:59:39 -07:00
cris	Kconfig: rename HAS_IOPORT to HAS_IOPORT_MAP	2014-04-07 16:36:11 -07:00
frv	PCI changes for the v3.15 merge window:	2014-04-01 15:14:04 -07:00
hexagon	Hexagon: Delete stale barrier.h	2014-05-01 10:09:47 -07:00
ia64	mm: split 'tlb_flush_mmu()' into tlb flushing and memory freeing parts	2014-04-25 16:05:40 -07:00
m32r	Kconfig: rename HAS_IOPORT to HAS_IOPORT_MAP	2014-04-07 16:36:11 -07:00
m68k	Kconfig: rename HAS_IOPORT to HAS_IOPORT_MAP	2014-04-07 16:36:11 -07:00
metag	Kconfig: rename HAS_IOPORT to HAS_IOPORT_MAP	2014-04-07 16:36:11 -07:00
microblaze	Microblaze patches for 3.15-rc1	2014-04-11 11:53:45 -07:00
mips	Merge branch 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2014-04-27 11:21:03 -07:00
mn10300	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs	2014-04-12 14:49:50 -07:00
openrisc	Kconfig: rename HAS_IOPORT to HAS_IOPORT_MAP	2014-04-07 16:36:11 -07:00
parisc	Merge branch 'parisc-3.15-3' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux	2014-05-01 15:54:44 -07:00
powerpc	powerpc/4xx: Fix section mismatch in ppc4xx_pci.c	2014-04-28 16:32:53 +10:00
s390	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux	2014-05-02 09:25:32 -07:00
score	score: remove unused CPU_SCORE7 Kconfig parameter	2014-04-03 16:20:52 -07:00
sh	mm: split 'tlb_flush_mmu()' into tlb flushing and memory freeing parts	2014-04-25 16:05:40 -07:00
sparc	sparc: csum_add for Sparc	2014-05-05 15:26:29 -04:00
tile	Kconfig: rename HAS_IOPORT to HAS_IOPORT_MAP	2014-04-07 16:36:11 -07:00
um	mm: split 'tlb_flush_mmu()' into tlb flushing and memory freeing parts	2014-04-25 16:05:40 -07:00
unicore32	Kconfig: rename HAS_IOPORT to HAS_IOPORT_MAP	2014-04-07 16:36:11 -07:00
x86	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2014-05-12 13:19:14 -04:00
xtensa	Xtensa patchset for v3.15.	2014-05-05 15:36:59 -07:00
.gitignore
Kconfig	uprobes: Kconfig dependency fix	2014-03-18 16:39:33 -04:00