Merge tag 'nios2-v4.2' of git://git.rocketboards.org/linux-socfpga-next
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 3 Jul 2015 19:22:49 +0000 (12:22 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 3 Jul 2015 19:22:49 +0000 (12:22 -0700)
commit31351f73ea37a5881fa24377ebc9e79487a77039
tree190ddb8cb56fba4d726c13eb47acdad85ca1378c
parent9a3c284a6dc894af066bbd6238a37996bb156c40
parenta8955cc3a504e43ecd606e9f0d9bc25de240aacb
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
arch/nios2/kernel/time.c