]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'ux500-timers' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw...
authorOlof Johansson <olof@lixom.net>
Tue, 7 Feb 2012 22:01:49 +0000 (14:01 -0800)
committerOlof Johansson <olof@lixom.net>
Tue, 7 Feb 2012 22:01:49 +0000 (14:01 -0800)
* '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


Trivial merge