From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 29 Oct 2009 16:07:15 +0000 (-0700)
Subject: Merge branch 'sh/for-2.6.32' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal... 
X-Git-Tag: v3.0~7071
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=0d43f5123d1456669b3bbc69854faf6fd5b14caa;p=platform%2Fkernel%2Flinux-amlogic.git

Merge branch 'sh/for-2.6.32' of git://git./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
---

0d43f5123d1456669b3bbc69854faf6fd5b14caa
diff --cc fs/Kconfig
index f93d0ed,48b81f9..2126078
--- a/fs/Kconfig
+++ b/fs/Kconfig
@@@ -135,8 -135,8 +135,8 @@@ config TMPFS_POSIX_AC
  
  config HUGETLBFS
  	bool "HugeTLB file system support"
- 	depends on X86 || IA64 || PPC_BOOK3S_64 || SPARC64 || (SUPERH && MMU) || \
- 		   (S390 && 64BIT) || SYS_SUPPORTS_HUGETLBFS || BROKEN
 -	depends on X86 || IA64 || PPC64 || SPARC64 || (S390 && 64BIT) || \
++	depends on X86 || IA64 || PPC_BOOK3S_64 || SPARC64 || (S390 && 64BIT) || \
+ 		   SYS_SUPPORTS_HUGETLBFS || BROKEN
  	help
  	  hugetlbfs is a filesystem backing for HugeTLB pages, based on
  	  ramfs. For architectures that support it, say Y here and read