tree d2c00d69ae3e5d6e0b83e6443def8f68e6fb5329
parent 427e3df6f22f919134adec42e5c9c889b7397196
parent 9ab3a15d95809a5d4feecda58b3749c53590e1b2
author Linus Torvalds <torvalds@linux-foundation.org> 1309455802 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1309455802 -0700

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

* 'sh-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-3.x:
  sh: use printk_ratelimited instead of printk_ratelimit
  sh: Fix up unmet dependency warnings with USB EHCI/OHCI selects.
  sh: fix the value of sh_dmae_slave_config in setup-sh7757
  sh: fix the INTC vector for IRQ and IRL in setup-sh7757
  sh: add to select the new configuration for USB EHCI/OHCI
  sh: add platform_device of EHCI/OHCI to setup-sh7757
  sh: fix compile error using sh7757lcr_defconfig