| #
4b61bb57 |
| 28-Aug-2009 |
Dmitry Torokhov <dmitry.torokhov@gmail.com> |
Merge commit 'v2.6.31-rc8' into next
|
| #
b855192c |
| 26-Aug-2009 |
H. Peter Anvin <hpa@zytor.com> |
Merge branch 'x86/urgent' into x86/pat
Reason: Change to is_new_memtype_allowed() in x86/urgent
Resolved semantic conflicts in:
arch/x86/mm/pat.c
arch/x86/mm/ioremap.c
Signed-off-by: H. Peter
Merge branch 'x86/urgent' into x86/pat
Reason: Change to is_new_memtype_allowed() in x86/urgent
Resolved semantic conflicts in:
arch/x86/mm/pat.c
arch/x86/mm/ioremap.c
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
show more ...
|
| #
e8a2eb47 |
| 25-Aug-2009 |
H. Peter Anvin <hpa@zytor.com> |
Merge commit 'origin/x86/urgent' into x86/asm
|
| #
daedc718 |
| 25-Aug-2009 |
Ingo Molnar <mingo@elte.hu> |
Merge commit 'v2.6.31-rc7' into irq/core
Merge reason: move from an -rc2 base to -rc7.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
|
| #
5f9ece02 |
| 24-Aug-2009 |
Ingo Molnar <mingo@elte.hu> |
Merge commit 'v2.6.31-rc7' into x86/cleanups
Merge reason: we were on -rc1 before - go up to -rc7
Signed-off-by: Ingo Molnar <mingo@elte.hu>
|
| #
8a517c51 |
| 23-Aug-2009 |
Ingo Molnar <mingo@elte.hu> |
Merge commit 'v2.6.31-rc7' into x86/cpu
|
| #
e9dc1221 |
| 21-Aug-2009 |
J. Bruce Fields <bfields@citi.umich.edu> |
Merge branch 'nfs-for-2.6.32' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6 into for-2.6.32-incoming
Conflicts:
net/sunrpc/cache.c
|
| #
51c8b407 |
| 19-Aug-2009 |
Dave Airlie <airlied@redhat.com> |
Merge Linus master to drm-next
linux-next conflict reported needed resolution.
Conflicts:
drivers/gpu/drm/drm_crtc.c
drivers/gpu/drm/drm_edid.c
drivers/gpu/drm/i915/intel_sdvo.c
drivers/gpu/drm
Merge Linus master to drm-next
linux-next conflict reported needed resolution.
Conflicts:
drivers/gpu/drm/drm_crtc.c
drivers/gpu/drm/drm_edid.c
drivers/gpu/drm/i915/intel_sdvo.c
drivers/gpu/drm/radeon/radeon_ttm.c
drivers/gpu/drm/ttm/ttm_bo.c
show more ...
|
| #
fa08661a |
| 15-Aug-2009 |
Ingo Molnar <mingo@elte.hu> |
Merge commit 'v2.6.31-rc6' into core/rcu
Merge reason: the branch was on pre-rc1 .30, update to latest.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
|
| #
08229de4 |
| 15-Aug-2009 |
Mark Brown <broonie@opensource.wolfsonmicro.com> |
Merge branch 'for-2.6.32' into mxc
Conflicts:
sound/soc/Makefile
|
| #
d2dcd910 |
| 14-Aug-2009 |
Paul Mundt <lethal@linux-sh.org> |
Merge branch 'master' into sh/cachetlb
|
| #
4cd1993f |
| 14-Aug-2009 |
Thomas Gleixner <tglx@linutronix.de> |
Merge branch 'linus' into timers/core
Reason: Martin's timekeeping cleanup series depends on both
timers/core and mainline changes.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
|
| #
384be2b1 |
| 14-Aug-2009 |
Tejun Heo <tj@kernel.org> |
Merge branch 'percpu-for-linus' into percpu-for-next
Conflicts:
arch/sparc/kernel/smp_64.c
arch/x86/kernel/cpu/perf_counter.c
arch/x86/kernel/setup_percpu.c
drivers/cpufreq/cpufreq_ondemand.c
m
Merge branch 'percpu-for-linus' into percpu-for-next
Conflicts:
arch/sparc/kernel/smp_64.c
arch/x86/kernel/cpu/perf_counter.c
arch/x86/kernel/setup_percpu.c
drivers/cpufreq/cpufreq_ondemand.c
mm/percpu.c
Conflicts in core and arch percpu codes are mostly from commit
ed78e1e078dd44249f88b1dd8c76dafb39567161 which substituted many
num_possible_cpus() with nr_cpu_ids. As for-next branch has moved all
the first chunk allocators into mm/percpu.c, the changes are moved
from arch code to mm/percpu.c.
Signed-off-by: Tejun Heo <tj@kernel.org>
show more ...
|
| #
e290861f |
| 12-Aug-2009 |
Paul Mundt <lethal@linux-sh.org> |
Merge branch 'sh/stable-updates'
|
| #
aa11d958 |
| 12-Aug-2009 |
David S. Miller <davem@davemloft.net> |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
arch/microblaze/include/asm/socket.h
|
| #
89034bc2 |
| 11-Aug-2009 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'linus' into tracing/core
Conflicts:
kernel/trace/trace_events_filter.c
We use the tracing/core version.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
|
| #
f222e8b4 |
| 09-Aug-2009 |
David S. Miller <davem@davemloft.net> |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
|
| #
a131bc18 |
| 08-Aug-2009 |
David Woodhouse <David.Woodhouse@intel.com> |
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
Pull fixes in from 2.6.31 so that people testing the iommu-2.6.git tree
no longer trip over bugs which were already fixed (sorry
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
Pull fixes in from 2.6.31 so that people testing the iommu-2.6.git tree
no longer trip over bugs which were already fixed (sorry, Horms).
show more ...
|
| #
012a5299 |
| 05-Aug-2009 |
James Morris <jmorris@namei.org> |
Merge branch 'master' into next
|
| #
13efdbec |
| 05-Aug-2009 |
Russell King <rmk@dyn-67.arm.linux.org.uk> |
Merge branch 'pm-upstream/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm into devel-stable
|
| #
e16852cf |
| 04-Aug-2009 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'tracing/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/frederic/random-tracing into tracing/urgent
|
| #
00111076 |
| 04-Aug-2009 |
Paul Mundt <lethal@linux-sh.org> |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6 into sh/hwblk
|
| #
8e9ed8b0 |
| 02-Aug-2009 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'sched/urgent' into sched/core
Merge reason: avoid upcoming patch conflict.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
|
| #
0a52ac8d |
| 30-Jul-2009 |
Russell King <rmk@dyn-67.arm.linux.org.uk> |
Merge branch 's3c-fixes-rc4' of git://aeryn.fluff.org.uk/bjdooks/linux
|
| #
b4093d62 |
| 29-Jul-2009 |
Rafael J. Wysocki <rjw@sisk.pl> |
Merge branch 'master' into for-linus
|