tree 200084e43bd60adc48fccd938667d9798f844bab
parent be91bfebf2940054e40850928d97859142b86556
parent d60cf53a30956e47919788b2ef49287786a959c9
author Linus Torvalds <torvalds@linux-foundation.org> 1299288661 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1299288661 -0800

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: Change __nosave_XXX symbols to long
  sh: Flush executable pages in copy_user_highpage
  sh: Ensure ST40-300 BogoMIPS value is consistent
  sh: sh7750: Fix incompatible pointer type
  sh: sh7750: move machtypes.h to include/generated