tree 9e98829c9c79b4085c762fe6fa00c6bb6f49e8f6
parent 435a71d9ef68b03343949c814986e01dae849763
parent 237674e050ae8ea40a432412df6c15d60b7ae8a6
author Linus Torvalds <torvalds@linux-foundation.org> 1250628866 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1250628866 -0700

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

* 'sh/for-2.6.31' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6:
  sh: sh7724 ddr self-refresh changes
  sh: use in-soc KEYSC on se7724
  sh: CMT suspend/resume
  sh: skip disabled LCDC channels