| commit | e8dad69408a9812d6bb42d03e74d2c314534a4fa | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Wed Apr 27 15:20:33 2011 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Wed Apr 27 15:20:33 2011 -0700 |
| tree | df2e09936ce189d587f4e6cfd2a70abd7238c3f7 | |
| parent | be6b694713740cea4610754171deec2db9cd668b [diff] | |
| parent | 4a5fa3590f09999f6db41bc386bce40848fa9f63 [diff] |
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