From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 2 Feb 2010 20:45:33 +0000 (-0800)
Subject: Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
X-Git-Tag: v3.0~6106
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e770a0f1154193ca6b6e720a86aeaa2edc9261c6;p=platform%2Fkernel%2Flinux-amlogic.git

Merge branch 'upstream' of git://ftp.linux-mips.org/upstream-linus

* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus:
  MIPS: 64-bit: Detect virtual memory size
  MIPS: AR7: Fix USB slave mem range typo
  MIPS: Alchemy: Fix dbdma ring destruction memory debugcheck.
---

e770a0f1154193ca6b6e720a86aeaa2edc9261c6