]> rtime.felk.cvut.cz Git - lisovros/linux_canprio.git/commit
Merge branch 'ux500-timers' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw...
authorOlof Johansson <olof@lixom.net>
Tue, 7 Feb 2012 23:13:50 +0000 (15:13 -0800)
committerOlof Johansson <olof@lixom.net>
Tue, 7 Feb 2012 23:13:50 +0000 (15:13 -0800)
commitafd96f8335dd1f54bf41a3485c564dfb50f490c5
tree6ddaf59a1390ecd9e54c1c7e0dba0b02aa48c349
parenta5f17d1f4c2831b9b9bf8b1a537cdbac995d6e13
parenta3b86a6d6f5a7592192eb3fca22ae38de18f2171
Merge branch 'ux500-timers' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson into next/soc

* 'ux500-timers' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson:
  ARM: plat-nomadik: modernize MTU timer
  ARM: plat-nomadik: handle clocking properly
  ARM: plat-nomadik: get rid of global mtu base pointer
arch/arm/mach-nomadik/board-nhk8815.c