From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 27 Apr 2011 22:20:33 +0000 (-0700)
Subject: Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/parisc-2.6
X-Git-Tag: v3.12-rc1~6268
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e8dad69408a9812d6bb42d03e74d2c314534a4fa;p=kernel%2Fkernel-generic.git

Merge branch 'fixes' of git://git./linux/kernel/git/jejb/parisc-2.6

* 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/parisc-2.6:
  [PARISC] slub: fix panic with DISCONTIGMEM
  [PARISC] set memory ranges in N_NORMAL_MEMORY when onlined
---

e8dad69408a9812d6bb42d03e74d2c314534a4fa