]> www.infradead.org Git - linux-platform-drivers-x86.git/commitdiff
projects / linux-platform-drivers-x86.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: be6b694 4a5fa35)
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)
* '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

1  2 
init/Kconfig patch | diff1 | diff2 | blob | history

diff --cc init/Kconfig
Simple merge
Unnamed repository; edit this file 'description' to name the repository.