| commit | 64a3dcd5d33d0c5253de2eba31b28a197d3e5e6b | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Mon Jun 09 10:23:29 2008 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Mon Jun 09 10:23:29 2008 -0700 |
| tree | 1a2ef97251cbdb2f024a86d07efc81b684f91685 | |
| parent | 53207293ba96552f67028ce54b74b4cc73c6d87a [diff] | |
| parent | 60d5019be8acef268f4676d229c490186d338fbc [diff] |
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc * 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc: [POWERPC] ehea: Remove dependency on MEMORY_HOTPLUG [POWERPC] Make walk_memory_resource available with MEMORY_HOTPLUG=n [POWERPC] Use dev_set_name in pci_64.c [POWERPC] Fix incorrect enabling of VMX when building signal or user context [POWERPC] boot/Makefile CONFIG_ variable fixes