]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit685a9e29afd00457739200725c70452962e6c800
treedf2e09936ce189d587f4e6cfd2a70abd7238c3f7
parent8be23a94f8f2bfad7699249146f172ad8647debd
parentee28561f6e4935baa32d62f65a8f109b889b68d9
Merge branch 'fixes' of git://git.kernel.org/pub/scm/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