| #
accba5f3 |
| 13-Oct-2008 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'linus' into oprofile-v2
Conflicts:
arch/x86/kernel/apic_32.c
arch/x86/oprofile/nmi_int.c
include/linux/pci_ids.h
|
|
Revision tags: v2.6.27, v2.6.27-rc9 |
|
| #
f68ec0c2 |
| 03-Oct-2008 |
Ingo Molnar <mingo@elte.hu> |
Merge commit 'v2.6.27-rc8' into x86/setup
|
| #
d6d5aeb6 |
| 02-Oct-2008 |
Ingo Molnar <mingo@elte.hu> |
Merge commit 'v2.6.27-rc8' into genirq
|
|
Revision tags: v2.6.27-rc8 |
|
| #
ebdd90a8 |
| 24-Sep-2008 |
Ingo Molnar <mingo@elte.hu> |
Merge commit 'v2.6.27-rc7' into x86/pebs
|
| #
0b88641f |
| 22-Sep-2008 |
Ingo Molnar <mingo@elte.hu> |
Merge commit 'v2.6.27-rc7' into x86/debug
|
|
Revision tags: v2.6.27-rc7, v2.6.27-rc6, v2.6.27-rc5 |
|
| #
470fba7e |
| 21-Aug-2008 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'linus' into x86/doc
|
|
Revision tags: v2.6.27-rc4 |
|
| #
2879a927 |
| 19-Aug-2008 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'x86/oprofile' into oprofile
|
| #
f3efbe58 |
| 15-Aug-2008 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'linus' into x86/gart
|
| #
5aa37e4f |
| 15-Aug-2008 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'x86/core' into x86/apic
|
| #
8d7ccaa5 |
| 14-Aug-2008 |
Ingo Molnar <mingo@elte.hu> |
Merge commit 'v2.6.27-rc3' into x86/prototypes
Conflicts:
include/asm-x86/dma-mapping.h
Signed-off-by: Ingo Molnar <mingo@elte.hu>
|
|
Revision tags: v2.6.27-rc3 |
|
| #
c4c0c56a |
| 11-Aug-2008 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'linus' into core/rcu
|
| #
6de9c708 |
| 11-Aug-2008 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'linus' into x86/cleanups
|
| #
8067794b |
| 11-Aug-2008 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'linus' into x86/x2apic
Conflicts:
arch/x86/kernel/genapic_64.c
Manual merge:
arch/x86/kernel/genx2apic_uv_x.c
Signed-off-by: Ingo Molnar <mingo@elte.hu>
|
| #
e4ddcb0a |
| 08-Aug-2008 |
Dmitry Torokhov <dmitry.torokhov@gmail.com> |
Merge commit 'v2.6.27-rc1' into for-linus
|
| #
af7a5356 |
| 08-Aug-2008 |
Ben Dooks <ben-linux@fluff.org> |
Merge http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm into for-rmk
|
|
Revision tags: v2.6.27-rc2 |
|
| #
85e9ca33 |
| 31-Jul-2008 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'linus' into timers/hpet
|
| #
bc588df7 |
| 30-Jul-2008 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'x86/core' into x86/xsave
|
| #
15dd859c |
| 30-Jul-2008 |
Ingo Molnar <mingo@elte.hu> |
Merge commit 'v2.6.27-rc1' into x86/core
Conflicts:
include/asm-x86/dma-mapping.h
include/asm-x86/namei.h
include/asm-x86/uaccess.h
Signed-off-by: Ingo Molnar <mingo@elte.hu>
|
| #
9fec6060 |
| 30-Jul-2008 |
Anton Vorontsov <cbouatmailru@gmail.com> |
Merge branch 'master' of /home/cbou/linux-2.6
Conflicts:
drivers/power/Kconfig
drivers/power/Makefile
|
|
Revision tags: v2.6.27-rc1 |
|
| #
cb28a1bb |
| 29-Jul-2008 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'linus' into core/generic-dma-coherent
Conflicts:
arch/x86/Kconfig
Signed-off-by: Ingo Molnar <mingo@elte.hu>
|
| #
414f746d |
| 28-Jul-2008 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'linus' into cpus4096
|
| #
b7d0b678 |
| 28-Jul-2008 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'linus' into x86/cpu
Conflicts:
arch/x86/kernel/cpu/intel_cacheinfo.c
Signed-off-by: Ingo Molnar <mingo@elte.hu>
|
| #
a403e45c |
| 28-Jul-2008 |
Ingo Molnar <mingo@elte.hu> |
Merge core/lib: pick up memparse() change.
Merge branch 'core/lib' into x86/xen
|
| #
50cb993e |
| 27-Jul-2008 |
Mauro Carvalho Chehab <mchehab@infradead.org> |
Merge ../linux-2.6
|
| #
eda3d8f5 |
| 27-Jul-2008 |
Haavard Skinnemoen <haavard.skinnemoen@atmel.com> |
Merge commit 'upstream/master'
|