| #
28c3cfd5 |
| 05-Sep-2008 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'linus' into x86/tracehook
|
| #
fe47784b |
| 04-Sep-2008 |
H. Peter Anvin <hpa@zytor.com> |
Merge branch 'x86/cpu' into x86/xsave
Conflicts:
arch/x86/kernel/cpu/feature_names.c
include/asm-x86/cpufeature.h
|
| #
7203781c |
| 04-Sep-2008 |
H. Peter Anvin <hpa@zytor.com> |
Merge branch 'x86/cpu' into x86/core
Conflicts:
arch/x86/kernel/cpu/feature_names.c
include/asm-x86/cpufeature.h
|
| #
42390cde |
| 04-Sep-2008 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'linus' into x86/x2apic
Conflicts:
arch/x86/kernel/cpu/cyrix.c
include/asm-x86/cpufeature.h
Signed-off-by: Ingo Molnar <mingo@elte.hu>
|
| #
b30a72a7 |
| 27-Aug-2008 |
H. Peter Anvin <hpa@zytor.com> |
Merge branch 'x86/urgent' into x86/cpu
Conflicts:
arch/x86/kernel/cpu/cyrix.c
|
| #
86d68898 |
| 27-Aug-2008 |
James Morris <jmorris@namei.org> |
Merge branch 'master' into next
|
| #
09bf825e |
| 27-Aug-2008 |
Simon Horman <horms@verge.net.au> |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
|
| #
3cf430b0 |
| 26-Aug-2008 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'linus' into sched/devel
|
| #
8b53b575 |
| 21-Aug-2008 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'x86/urgent' into x86/pat
Conflicts:
arch/x86/mm/pageattr.c
Signed-off-by: Ingo Molnar <mingo@elte.hu>
|
| #
470fba7e |
| 21-Aug-2008 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'linus' into x86/doc
|
| #
170465ee |
| 20-Aug-2008 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'linus' into x86/xen
|
| #
7393423d |
| 20-Aug-2008 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'linus' into x86/cleanups
|
| #
024b246e |
| 15-Aug-2008 |
Linus Torvalds <torvalds@linux-foundation.org> |
alpha: move include/asm-alpha to arch/alpha/include/asm
Sam Ravnborg did the build-test that the direct header file move works,
I'm just committing it.
This is a pure move:
mkdir arch/alpha/inclu
alpha: move include/asm-alpha to arch/alpha/include/asm
Sam Ravnborg did the build-test that the direct header file move works,
I'm just committing it.
This is a pure move:
mkdir arch/alpha/include
git mv include/asm-alpha arch/alpha/include/asm
with no other changes.
Requested-and-tested-by: Sam Ravnborg <sam@ravnborg.org>
Cc: Richard Henderson <rth@twiddle.net>
Cc: Ivan Kokshaysky <ink@jurassic.park.msu.ru>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
show more ...
|