| #
b2aaf8f7 |
| 15-Oct-2008 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'linus' into stackprotector
Conflicts:
arch/x86/kernel/Makefile
include/asm-x86/pda.h
|
| #
7a9787e1 |
| 28-Oct-2008 |
Ingo Molnar <mingo@elte.hu> |
Merge commit 'v2.6.28-rc2' into x86/pci-ioapic-boot-irq-quirks
|
| #
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
|
| #
0b88641f |
| 22-Sep-2008 |
Ingo Molnar <mingo@elte.hu> |
Merge commit 'v2.6.27-rc7' into x86/debug
|
| #
470fba7e |
| 21-Aug-2008 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'linus' into x86/doc
|
| #
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>
|
| #
c4c0c56a |
| 11-Aug-2008 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'linus' into core/rcu
|
| #
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
|
| #
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
|
| #
9fec6060 |
| 29-Jul-2008 |
Anton Vorontsov <cbouatmailru@gmail.com> |
Merge branch 'master' of /home/cbou/linux-2.6
Conflicts:
drivers/power/Kconfig
drivers/power/Makefile
|
| #
cb28a1bb |
| 28-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>
|
| #
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>
|
| #
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'
|
| #
15d3b4a2 |
| 27-Jul-2008 |
David S. Miller <davem@davemloft.net> |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
|
| #
c3cc99ff |
| 26-Jul-2008 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'linus' into x86/xen
|
| #
bda307ed |
| 26-Jul-2008 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'linus' into x86/cleanups
|
| #
1503af66 |
| 26-Jul-2008 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'linus' into x86/header-guards
Conflicts:
include/asm-x86/gpio.h
include/asm-x86/ide.h
Signed-off-by: Ingo Molnar <mingo@elte.hu>
|
| #
88bef5a4 |
| 26-Jul-2008 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'linus' into x86/urgent
|
| #
10a010f6 |
| 25-Jul-2008 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'linus' into x86/x2apic
Conflicts:
drivers/pci/dmar.c
Signed-off-by: Ingo Molnar <mingo@elte.hu>
|