From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 19 May 2010 20:34:20 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
X-Git-Tag: 2.1b_release~8399
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=711f77f53c5ff6aa61dbe8e5f518e50d6306e89d;p=platform%2Fkernel%2Fkernel-mfld-blackbay.git

Merge git://git./linux/kernel/git/davem/sparc-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
  sparc: Define ARCH_SLAB_MINALIGN
  drivers/sbus/char/flash.c: flash_read should update ppos instead of file->f_pos
  sparc64: Fix stack dumping and tracing when function graph is enabled.
  sparc64: Show stack backtrace from show_regs() just like other platforms.
---

711f77f53c5ff6aa61dbe8e5f518e50d6306e89d