summaryrefslogtreecommitdiffstats
path: root/drivers/irqchip/irq-renesas-irqc.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2016-06-30 11:03:36 +0200
committerDavid S. Miller <davem@davemloft.net>2016-06-30 11:03:36 +0200
commitee58b57100ca953da7320c285315a95db2f7053d (patch)
tree77b815a31240adc4d6326346908137fc6c2c3a96 /drivers/irqchip/irq-renesas-irqc.c
parentMerge branch '40GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirshe... (diff)
parentMerge tag 'nfs-for-4.7-2' of git://git.linux-nfs.org/projects/anna/linux-nfs (diff)
downloadlinux-ee58b57100ca953da7320c285315a95db2f7053d.tar.xz
linux-ee58b57100ca953da7320c285315a95db2f7053d.zip
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Several cases of overlapping changes, except the packet scheduler conflicts which deal with the addition of the free list parameter to qdisc_enqueue(). Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/irqchip/irq-renesas-irqc.c')
0 files changed, 0 insertions, 0 deletions