]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
projects / users / jedix / linux-maple.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a5f17d1 a3b86a6)
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)
* '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

1  2 
arch/arm/mach-nomadik/board-nhk8815.c patch | diff1 | diff2 | blob | history

diff --cc arch/arm/mach-nomadik/board-nhk8815.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.