projects / linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: ff55df5 ac5672f)
Merge branch 'x86/paravirt' into x86/cpu
authorIngo Molnar <mingo@elte.hu>
Tue, 1 Sep 2009 10:13:30 +0000 (12:13 +0200)
committerIngo Molnar <mingo@elte.hu>
Tue, 1 Sep 2009 10:13:30 +0000 (12:13 +0200)
commitc931aaf0e1b11862077f6884b2cec22833080e23
treea54b0ff24dd4b09fe8b3bff62b7c5ce82e197387tree | snapshot
parentff55df53dfdd338906c8ba9d1f4a759b86b869d5commit | diff
parentac5672f82c39ff2f8dce81bf3e68b1dfc41f366fcommit | diff
Merge branch 'x86/paravirt' into x86/cpu

Conflicts:
arch/x86/include/asm/paravirt.h

Manual merge:
arch/x86/include/asm/paravirt_types.h

Merge reason: x86/paravirt conflicts non-trivially with x86/cpu,
              resolve it.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
arch/x86/include/asm/paravirt.h diff1 | diff2 | blob | history
arch/x86/include/asm/paravirt_types.h | diff2 | blob | history
ep93xx device tree rework repo: git://git.maquefel.me/linux.git