]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
Merge tag 'arc-4.6-rc4-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 11 Apr 2016 19:19:57 +0000 (12:19 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 11 Apr 2016 19:19:57 +0000 (12:19 -0700)
commita56711fa0b418a2cf5eefa00ee65e16443e47790
tree4ae117f86b685be4a2339579c0d0dc1c81164c4b
parentbf16200689118d19de1b8d2a3c314fc21f5dc7bb
parent0dee6c82c2aa5342357dabd0e536a97f72039f0b
Merge tag 'arc-4.6-rc4-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc

Pull ARC fixes from Vineet Gupta:
 - fix Kconfig splat due to pcie rework
 - make ethernet work again on axs103
 - provide fb_pgprotect() for future video driver integration

* tag 'arc-4.6-rc4-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc:
  ARC: [plat-axs103] Enable loop block devices
  Revert "ARC: [plat-axs10x] add Ethernet PHY description in .dts"
  arc: Add our own implementation of fb_pgprotect()
  ARC: Don't source drivers/pci/pcie/Kconfig ourselves