| #
35437b61 |
| 07-Oct-2008 |
Russell King <rmk@dyn-67.arm.linux.org.uk> |
Merge branches 'metronomefb', 'pxa-cm2xx', 'pxa-gumstix', 'pxa-misc', 'pxa-mitac', 'pxa-mp900', 'pxa-zylonite' and 'pxa-zaurus' into pxa-machines
Conflicts:
arch/arm/mach-pxa/poodle.c
|
| #
f68ec0c2 |
| 03-Oct-2008 |
Ingo Molnar <mingo@elte.hu> |
Merge commit 'v2.6.27-rc8' into x86/setup
|
| #
56f68556 |
| 03-Oct-2008 |
Russell King <rmk@dyn-67.arm.linux.org.uk> |
Merge unstable branch 'omap-rmk'
Merge branch 'omap-rmk' into omap-all
|
| #
d6d5aeb6 |
| 02-Oct-2008 |
Ingo Molnar <mingo@elte.hu> |
Merge commit 'v2.6.27-rc8' into genirq
|
| #
59293c8a |
| 30-Sep-2008 |
Ingo Molnar <mingo@elte.hu> |
Merge commit 'v2.6.27-rc8' into oprofile
Conflicts:
arch/x86/oprofile/nmi_int.c
Signed-off-by: Ingo Molnar <mingo@elte.hu>
|
| #
f78e8020 |
| 24-Sep-2008 |
Robert Richter <robert.richter@amd.com> |
Merge commit 'v2.6.27-rc5' into tip/oprofile
Conflicts:
arch/x86/oprofile/nmi_int.c
|
| #
e6aa0f07 |
| 24-Sep-2008 |
Ingo Molnar <mingo@elte.hu> |
Merge commit 'v2.6.27-rc7' into x86/microcode
|
| #
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
|
| #
5e51900b |
| 19-Sep-2008 |
Ingo Molnar <mingo@elte.hu> |
Merge commit 'v2.6.27-rc6' into x86/cleanups
|
| #
83bd6998 |
| 14-Sep-2008 |
Ingo Molnar <mingo@elte.hu> |
Merge commit 'v2.6.27-rc6' into timers/hpet
|
| #
f81b691a |
| 14-Sep-2008 |
Ingo Molnar <mingo@elte.hu> |
Merge commit 'v2.6.27-rc6' into x86/pat
|
| #
3ce9bcb5 |
| 10-Sep-2008 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'core/xen' into x86/xen
|
| #
e92b4fda |
| 10-Sep-2008 |
Ingo Molnar <mingo@elte.hu> |
Merge commit 'v2.6.27-rc6' into x86/iommu
|
| #
6003ab0b |
| 10-Sep-2008 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'linus' into core/debug
Conflicts:
lib/vsprintf.c
Manual merge:
include/linux/kernel.h
Signed-off-by: Ingo Molnar <mingo@elte.hu>
|
| #
429b022a |
| 10-Sep-2008 |
Ingo Molnar <mingo@elte.hu> |
Merge commit 'v2.6.27-rc6' into core/rcu
|
| #
7e392f8c |
| 10-Sep-2008 |
Paul Mackerras <paulus@samba.org> |
Merge branch 'linux-2.6'
|
| #
c051a0a2 |
| 09-Sep-2008 |
Simon Horman <horms@verge.net.au> |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6 into lvs-next-2.6
|
| #
17dce5df |
| 08-Sep-2008 |
David S. Miller <davem@davemloft.net> |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
net/mac80211/mlme.c
|
| #
98d86c09 |
| 08-Sep-2008 |
David S. Miller <davem@davemloft.net> |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
Conflicts:
arch/sparc/kernel/of_device.c
|
| #
7f79d852 |
| 06-Sep-2008 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'linus' into sched/devel
|
| #
77dd3b3b |
| 06-Sep-2008 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'linus' into timers/ntp
|
| #
616ad8c4 |
| 05-Sep-2008 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'linus' into x86/defconfig
|
| #
28c3cfd5 |
| 05-Sep-2008 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'linus' into x86/tracehook
|
| #
0ccd8c39 |
| 04-Sep-2008 |
H. Peter Anvin <hpa@zytor.com> |
Merge branch 'linus' into x86/core
|