#
a5ebc0b1 |
| 26-Mar-2009 |
Ingo Molnar <mingo@elte.hu> |
Merge commit 'v2.6.29' into timers/core
|
#
703a3cd7 |
| 24-Mar-2009 |
James Morris <jmorris@namei.org> |
Merge branch 'master' into next
|
Revision tags: v2.6.29 |
|
#
0702b30d |
| 19-Mar-2009 |
David S. Miller <davem@davemloft.net> |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
|
#
47239561 |
| 17-Mar-2009 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'linus' into core/printk
|
#
37ba1b62 |
| 17-Mar-2009 |
Takashi Iwai <tiwai@suse.de> |
Merge branch 'fix/opl3sa2-suspend' into topic/isa-misc
|
#
edb35028 |
| 16-Mar-2009 |
Ingo Molnar <mingo@elte.hu> |
Merge branches 'irq/genirq' and 'linus' into irq/core
|
#
97fb44eb |
| 13-Mar-2009 |
Russell King <rmk@dyn-67.arm.linux.org.uk> |
Merge branch 'for-rmk' of git://git.pengutronix.de/git/imx/linux-2.6 into devel
Conflicts:
arch/arm/mach-at91/gpio.c
|
Revision tags: v2.6.29-rc8 |
|
#
d95c3578 |
| 11-Mar-2009 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'x86/core' into cpus4096
|
#
e14eee56 |
| 11-Mar-2009 |
Benjamin Herrenschmidt <benh@kernel.crashing.org> |
Merge commit 'origin/master' into next
|
#
e161183b |
| 10-Mar-2009 |
Paul Mundt <lethal@linux-sh.org> |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
|
#
efdcd41b |
| 09-Mar-2009 |
Takashi Iwai <tiwai@suse.de> |
Merge branch 'topic/vmaster-update' into topic/docbook-fix
|
#
d15c22e7 |
| 09-Mar-2009 |
Dmitry Torokhov <dmitry.torokhov@gmail.com> |
Merge commit 'v2.6.29-rc7' into next
|
#
7df4edb0 |
| 05-Mar-2009 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'linus' into core/iommu
|
#
a140feab |
| 05-Mar-2009 |
Ingo Molnar <mingo@elte.hu> |
Merge commit 'v2.6.29-rc7' into core/locking
|
Revision tags: v2.6.29-rc7 |
|
#
d4fc7cea |
| 03-Mar-2009 |
Felix Blyakher <felixb@sgi.com> |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
|
#
c02368a9 |
| 02-Mar-2009 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'linus' into irq/genirq
|
#
4434e515 |
| 26-Feb-2009 |
Ingo Molnar <mingo@elte.hu> |
Merge branches 'sched/cleanups', 'sched/urgent' and 'linus' into sched/core
|
#
8e818179 |
| 26-Feb-2009 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'x86/core' into perfcounters/core
Conflicts: arch/x86/kernel/apic/apic.c arch/x86/kernel/irqinit_32.c
Signed-off-by: Ingo Molnar <mingo@elte.hu>
|
#
2e31add2 |
| 25-Feb-2009 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'x86/urgent' into x86/pat
|
#
87b20307 |
| 24-Feb-2009 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'x86/core' into core/percpu
|
#
a852cbfa |
| 24-Feb-2009 |
Ingo Molnar <mingo@elte.hu> |
Merge branches 'x86/acpi', 'x86/apic', 'x86/asm', 'x86/cleanups', 'x86/mm', 'x86/signal' and 'x86/urgent'; commit 'v2.6.29-rc6' into x86/core
|
#
e70049b9 |
| 24-Feb-2009 |
David S. Miller <davem@davemloft.net> |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
|
#
467388f2 |
| 24-Feb-2009 |
David S. Miller <davem@davemloft.net> |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
|
#
dc731ca6 |
| 23-Feb-2009 |
H. Peter Anvin <hpa@linux.intel.com> |
Merge branch 'x86/urgent' into x86/mce2
|
Revision tags: v2.6.29-rc6 |
|
#
fc6fc7f1 |
| 22-Feb-2009 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'linus' into x86/apic
Conflicts: arch/x86/mach-default/setup.c
Semantic conflict resolution: arch/x86/kernel/setup.c
Signed-off-by: Ingo Molnar <mingo@elte.hu>
|