]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 96b4ef4 993c518)
Merge commit 'v2.6.31-rc8' into x86/txt
authorIngo Molnar <mingo@elte.hu>
Wed, 2 Sep 2009 06:17:56 +0000 (08:17 +0200)
committerIngo Molnar <mingo@elte.hu>
Wed, 2 Sep 2009 06:17:56 +0000 (08:17 +0200)
commitb12af3d2065d71bacbd9b40ecf1d2c1f666d6a71
tree5ed5c1f6735dcd26550594df23c8f7fe2aa21a15tree | snapshot
parent96b4ef4569aa3ee188b616a62f43ab595ff851e7commit | diff
parent993c518420c3f02bd3508eefeeb2056ba892ac41commit | diff
Merge commit 'v2.6.31-rc8' into x86/txt

Conflicts:
arch/x86/kernel/reboot.c
security/Kconfig

Merge reason: resolve the conflicts, bump up from rc3 to rc8.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
arch/x86/Kconfig diff1 | diff2 | blob | history
arch/x86/kernel/reboot.c diff1 | diff2 | blob | history
arch/x86/kernel/setup.c diff1 | diff2 | blob | history
drivers/pci/intel-iommu.c diff1 | diff2 | blob | history
security/Kconfig diff1 | diff2 | blob | history
Linux Kernel Source Tree.