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: v2.6.32-rc6~41
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0d43f5123d1456669b3bbc69854faf6fd5b14caa;p=pandora-kernel.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
Reading git-diff-tree failed