From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Fri, 20 Oct 2006 17:27:55 +0000 (-0700)
Subject: Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
X-Git-Tag: v3.12-rc1~31920^2~47^2~11
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d2c5f06e361f18be0d7b75988ce6a9e8800a8113;p=kernel%2Fkernel-generic.git

Merge /pub/scm/linux/kernel/git/davem/sparc-2.6

* master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6:
  [SPARC]: Clean up asm-sparc/elf.h pollution in userspace.
  [SPARC64]: Fix of_ioremap().
  [SPARC64]: Compute dma_end argument to sabre_pbm_init() correctly.
---

d2c5f06e361f18be0d7b75988ce6a9e8800a8113