tree e69d4418d579e55a004c2263ac49a46aac161a54
parent fb3165b59f9ce510fed07262db20fdb799f88fa6
parent ffb4a73d8906f71910e6c83ec2b499e70025ee8e
author Linus Torvalds <torvalds@linux-foundation.org> 1256832435 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1256832435 -0700

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

* 'sh/for-2.6.32' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6:
  sh: Fix hugetlbfs dependencies for SH-3 && MMU configurations.
  sh: Document uImage.bin target in archhelp.
  sh: add uImage.bin target
  sh: rsk7203 CONFIG_MTD=n fix
  sh: Check for return_to_handler when unwinding the stack
  sh: Build fix: define more __movmem* symbols
  sh: __irq_entry annotate do_IRQ().

Fix up sh/powerpc conflicts in fs/Kconfig