tree de59e3130d6e715a45199bf28e10d43d2ec570b1
parent 68ca92aa1f980d91ac98f798b313b70864f60e4b
parent dfcd6e438927ad8c54278e5b1a34a4fe76e57ad2
author Linus Torvalds <torvalds@linux-foundation.org> 1290635899 +0900
committer Linus Torvalds <torvalds@linux-foundation.org> 1290635899 +0900

Merge branch 'sh-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6

* 'sh-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6:
  sh: clkfwk: Build fix for non-legacy CPG changes.
  sh: Use GCC __builtin_prefetch() to implement prefetch().
  sh: fix vsyscall compilation due to .eh_frame issue
  sh: avoid to flush all cache in sys_cacheflush
  sh: clkfwk: Disable init clk op for non-legacy clocks.
  sh: clkfwk: Kill off now unused algo_id in set_rate op.
  sh: clkfwk: Kill off unused clk_set_rate_ex().