Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/parisc-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 27 Apr 2011 22:20:33 +0000 (15:20 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 27 Apr 2011 22:20:33 +0000 (15:20 -0700)
commite8dad69408a9812d6bb42d03e74d2c314534a4fa
treedf2e09936ce189d587f4e6cfd2a70abd7238c3f7
parentbe6b694713740cea4610754171deec2db9cd668b
parent4a5fa3590f09999f6db41bc386bce40848fa9f63
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
init/Kconfig