author | Linus Torvalds <torvalds@linux-foundation.org> | |
Wed, 10 Jul 2013 17:11:26 +0000 (10:11 -0700) | ||
committer | Linus Torvalds <torvalds@linux-foundation.org> | |
Wed, 10 Jul 2013 17:11:26 +0000 (10:11 -0700) |
Pull second set of ARC architecture updates from Vineet Gupta:
"Couple of Platform updates (Device Tree files primarily) given that
the corresponding drivers (net/ethernet/arc/*, irqctl/irq-tb10x.c)
have now been merged into your tree.
Ideally these shd have been part of same submissions, oh well..."
* tag 'arc-v3.11-rc1-part2' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc:
ARC: [TB10x] Updates for irqchip driver
ARC: [plat-arcfpga] Enable arc_emac for ARCAngle4 Board
"Couple of Platform updates (Device Tree files primarily) given that
the corresponding drivers (net/ethernet/arc/*, irqctl/irq-tb10x.c)
have now been merged into your tree.
Ideally these shd have been part of same submissions, oh well..."
* tag 'arc-v3.11-rc1-part2' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc:
ARC: [TB10x] Updates for irqchip driver
ARC: [plat-arcfpga] Enable arc_emac for ARCAngle4 Board
1 | 2 | |||
---|---|---|---|---|
arch/arc/configs/fpga_defconfig | patch | | diff1 | | diff2 | | blob | history |
diff --cc arch/arc/configs/fpga_defconfig
Simple merge