From: Linus Torvalds Date: Fri, 3 Jul 2015 19:22:49 +0000 (-0700) Subject: Merge tag 'nios2-v4.2' of git://git.rocketboards.org/linux-socfpga-next X-Git-Tag: v4.2-rc1~19 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=31351f73ea37a5881fa24377ebc9e79487a77039;p=karo-tx-linux.git Merge tag 'nios2-v4.2' of git://git.rocketboards.org/linux-socfpga-next Pull nios2 update from Ley Foon Tan: "Check number of timer instances" * tag 'nios2-v4.2' of git://git.rocketboards.org/linux-socfpga-next: nios2: check number of timer instances --- 31351f73ea37a5881fa24377ebc9e79487a77039