From: Wolfgang Denk Date: Sat, 1 Sep 2012 12:09:41 +0000 (+0200) Subject: Merge branch 'master' of git://git.denx.de/u-boot-sh X-Git-Tag: v2012.10-rc1~367 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=7cddabce59f500efe38b0003641ea0d25b0822a2;p=oweals%2Fu-boot.git 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 --- 7cddabce59f500efe38b0003641ea0d25b0822a2