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)
commit7cddabce59f500efe38b0003641ea0d25b0822a2
treebf872bea3e5c8e22df1461b0b66180eb597e4254
parentc51261e8dbf9a02859a7f6008c973880316af069
parent31d4fe8d405c4b9e27f7eca6c6710092ba14b49d
Merge branch 'master' of git://git.denx.de/u-boot-sh

* '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>