|
Revision tags: v2.6.30-rc1 |
|
| #
5e344378 |
| 07-Apr-2009 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'linus' into core/softlockup
Conflicts:
kernel/sysctl.c
|
| #
f541ae32 |
| 06-Apr-2009 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'linus' into perfcounters/core-v2
Merge reason: we have gathered quite a few conflicts, need to merge upstream
Conflicts:
arch/powerpc/kernel/Makefile
arch/x86/ia32/ia32entry.S
arch
Merge branch 'linus' into perfcounters/core-v2
Merge reason: we have gathered quite a few conflicts, need to merge upstream
Conflicts:
arch/powerpc/kernel/Makefile
arch/x86/ia32/ia32entry.S
arch/x86/include/asm/hardirq.h
arch/x86/include/asm/unistd_32.h
arch/x86/include/asm/unistd_64.h
arch/x86/kernel/cpu/common.c
arch/x86/kernel/irq.c
arch/x86/kernel/syscall_table_32.S
arch/x86/mm/iomap_32.c
include/linux/sched.h
kernel/Makefile
Signed-off-by: Ingo Molnar <mingo@elte.hu>
show more ...
|
| #
d00ab2fd |
| 28-Mar-2009 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'linus' into core/futexes
|
| #
b92efa9a |
| 27-Mar-2009 |
Haavard Skinnemoen <haavard.skinnemoen@atmel.com> |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into avr32-arch
|
| #
08abe18a |
| 26-Mar-2009 |
David S. Miller <davem@davemloft.net> |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Conflicts:
drivers/net/wimax/i2400m/usb-notif.c
|
| #
18ffa418 |
| 26-Mar-2009 |
Ingo Molnar <mingo@elte.hu> |
Merge commit 'v2.6.29' into x86/setup-lzma
|
| #
5a54bd13 |
| 26-Mar-2009 |
Ingo Molnar <mingo@elte.hu> |
Merge commit 'v2.6.29' into core/header-fixes
|
| #
a5ebc0b1 |
| 26-Mar-2009 |
Ingo Molnar <mingo@elte.hu> |
Merge commit 'v2.6.29' into timers/core
|
| #
8937b734 |
| 25-Mar-2009 |
Russell King <rmk@dyn-67.arm.linux.org.uk> |
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6 into devel
|
| #
9e41d959 |
| 23-Mar-2009 |
Benjamin Herrenschmidt <benh@kernel.crashing.org> |
Merge commit 'origin/master' into next
|
| #
703a3cd7 |
| 23-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/
|
| #
705bb9dc |
| 18-Mar-2009 |
Ingo Molnar <mingo@elte.hu> |
Merge branches 'x86/cleanups', 'x86/cpu', 'x86/debug', 'x86/mce2', 'x86/mm', 'x86/mtrr', 'x86/setup', 'x86/setup-memory', 'x86/urgent', 'x86/uv', 'x86/x2apic' and 'linus' into x86/core
Conflicts:
a
Merge branches 'x86/cleanups', 'x86/cpu', 'x86/debug', 'x86/mce2', 'x86/mm', 'x86/mtrr', 'x86/setup', 'x86/setup-memory', 'x86/urgent', 'x86/uv', 'x86/x2apic' and 'linus' into x86/core
Conflicts:
arch/parisc/kernel/irq.c
show more ...
|
| #
04dfcfcb |
| 18-Mar-2009 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'linus' into core/iommu
|
| #
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
|
| #
cb1b7780 |
| 16-Mar-2009 |
Felix Blyakher <felixb@sgi.com> |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
|
| #
edb35028 |
| 16-Mar-2009 |
Ingo Molnar <mingo@elte.hu> |
Merge branches 'irq/genirq' and 'linus' into irq/core
|
| #
0ca0f16f |
| 14-Mar-2009 |
Ingo Molnar <mingo@elte.hu> |
Merge branches 'x86/apic', 'x86/asm', 'x86/cleanups', 'x86/debug', 'x86/kconfig', 'x86/mm', 'x86/ptrace', 'x86/setup' and 'x86/urgent'; commit 'v2.6.29-rc8' into x86/core
|
| #
17d85bc7 |
| 12-Mar-2009 |
Ingo Molnar <mingo@elte.hu> |
Merge commit 'v2.6.29-rc8' into cpus4096
|
| #
f6411fe7 |
| 12-Mar-2009 |
Ingo Molnar <mingo@elte.hu> |
Merge branches 'sched/clock', 'sched/urgent' and 'linus' into sched/core
|
|
Revision tags: v2.6.29-rc8 |
|
| #
25d50006 |
| 12-Mar-2009 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'linus' into core/ipi
|
| #
51b643b4 |
| 12-Mar-2009 |
Steven Rostedt <srostedt@redhat.com> |
Merge branch 'tracing/ftrace' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip into trace/tip/tracing/ftrace-merge
|
| #
480c93df |
| 12-Mar-2009 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'core/locking' into tracing/ftrace
|
| #
3c1f67d6 |
| 12-Mar-2009 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'linus' into core/locking
|