]> git.sur5r.net Git - u-boot/commitdiff
Merge branch 'master' of git://git.denx.de/u-boot-sh
authorWolfgang Denk <wd@denx.de>
Sat, 1 Sep 2012 12:09:41 +0000 (14:09 +0200)
committerWolfgang Denk <wd@denx.de>
Sat, 1 Sep 2012 12:09:41 +0000 (14:09 +0200)
* 'master' of git://git.denx.de/u-boot-sh:
  sh: tmu: Removed arch/sh/include/asm/clk.h
  sh: tmu: Changed switch statement to shift operation
  sh: tmu: Changed TMU driver using array of structures

Signed-off-by: Wolfgang Denk <wd@denx.de>

Trivial merge