]> err.no Git - linux-2.6/commit
projects / linux-2.6 / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 5320729 60d5019)
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 9 Jun 2008 17:23:29 +0000 (10:23 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 9 Jun 2008 17:23:29 +0000 (10:23 -0700)
commit64a3dcd5d33d0c5253de2eba31b28a197d3e5e6b
tree1a2ef97251cbdb2f024a86d07efc81b684f91685tree | snapshot
parent53207293ba96552f67028ce54b74b4cc73c6d87acommit | diff
parent60d5019be8acef268f4676d229c490186d338fbccommit | 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
Linux 2.6 source tree