Revision tags: v2.6.32-rc1, v2.6.32-rc2 |
|
#
53cddfcc |
| 25-Sep-2009 |
Linus Torvalds <torvalds@linux-foundation.org> |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6: sh_mobile_ceu_camera: fix compile breakage, caused by a bad merge
Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6: sh_mobile_ceu_camera: fix compile breakage, caused by a bad merge sh: Add support DMA Engine to SH7780 sh: Add support DMA Engine to SH7722 sh: enable onenand support in kfr2r09 defconfig. sh: update defconfigs. sh: add FSI driver support for ms7724se sh: Fix up uninitialized variable use caught by gcc 4.4. sh: Handle unaligned 16-bit instructions on SH-2A. sh: mach-ecovec24: Add active low setting for sh_eth sh: includecheck fix: dwarf.c
show more ...
|
#
5d65498b |
| 25-Sep-2009 |
Paul Mundt <lethal@linux-sh.org> |
sh: update defconfigs.
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
|
#
f0568783 |
| 23-Sep-2009 |
Anton Vorontsov <avorontsov@ru.mvista.com> |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts: drivers/power/wm97xx_battery.c
|
#
fc8e1ead |
| 14-Sep-2009 |
Dmitry Torokhov <dmitry.torokhov@gmail.com> |
Merge branch 'next' into for-linus
|
#
cf7a2b4f |
| 12-Sep-2009 |
Russell King <rmk@dyn-67.arm.linux.org.uk> |
Merge branches 'arm', 'at91', 'bcmring', 'ep93xx', 'mach-types', 'misc' and 'w90x900' into devel
|
Revision tags: v2.6.31 |
|
#
9134d02b |
| 09-Sep-2009 |
Dan Williams <dan.j.williams@intel.com> |
Merge commit 'md/for-linus' into async-tx-next
Conflicts: drivers/md/raid5.c
|
#
bbb20089 |
| 09-Sep-2009 |
Dan Williams <dan.j.williams@intel.com> |
Merge branch 'dmaengine' into async-tx-next
Conflicts: crypto/async_tx/async_xor.c drivers/dma/ioat/dma_v2.h drivers/dma/ioat/pci.c drivers/md/raid5.c
|
#
a348a7e6 |
| 08-Sep-2009 |
Dan Williams <dan.j.williams@intel.com> |
Merge commit 'v2.6.31-rc1' into dmaengine
|
#
a1922ed6 |
| 07-Sep-2009 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'tracing/core' into tracing/hw-breakpoints
Conflicts: arch/Kconfig kernel/trace/trace.h
Merge reason: resolve the conflicts, plus adopt to the new ring-buffer APIs.
Si
Merge branch 'tracing/core' into tracing/hw-breakpoints
Conflicts: arch/Kconfig kernel/trace/trace.h
Merge reason: resolve the conflicts, plus adopt to the new ring-buffer APIs.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
show more ...
|
Revision tags: v2.6.31-rc9, v2.6.31-rc8 |
|
#
8a517c51 |
| 23-Aug-2009 |
Ingo Molnar <mingo@elte.hu> |
Merge commit 'v2.6.31-rc7' into x86/cpu
|
Revision tags: v2.6.31-rc7 |
|
#
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
|
#
f72222c7 |
| 18-Aug-2009 |
Mark Brown <broonie@opensource.wolfsonmicro.com> |
Merge branch 'topic/asoc' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6 into upstream/wm8711
|
#
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
|
Revision tags: v2.6.31-rc6 |
|
#
f222e8b4 |
| 10-Aug-2009 |
David S. Miller <davem@davemloft.net> |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
|
Revision tags: v2.6.31-rc5 |
|
#
bd072111 |
| 23-Jul-2009 |
Dmitry Torokhov <dmitry.torokhov@gmail.com> |
Merge commit 'v2.6.31-rc4' into next
|
Revision tags: v2.6.31-rc4 |
|
#
5304d5fc |
| 18-Jul-2009 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'linus' into sched/core
Merge reason: branch had an old upstream base (-rc1-ish), but also merge to avoid a conflict.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
|
#
45bceffc |
| 18-Jul-2009 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'linus' into tracing/core
Merge reason: tracing/core was on an older, pre-rc1 base.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
|
#
debc6a69 |
| 14-Jul-2009 |
Robert Richter <robert.richter@amd.com> |
Merge commit 'v2.6.31-rc3'; commit 'tip/oprofile' into oprofile/core
Conflicts: drivers/oprofile/oprofile_stats.c drivers/usb/otg/Kconfig drivers/usb/otg/Makefile
Signed-off-by: Robert Richter <
Merge commit 'v2.6.31-rc3'; commit 'tip/oprofile' into oprofile/core
Conflicts: drivers/oprofile/oprofile_stats.c drivers/usb/otg/Kconfig drivers/usb/otg/Makefile
Signed-off-by: Robert Richter <robert.richter@amd.com>
show more ...
|
Revision tags: v2.6.31-rc3 |
|
#
7d45ecaf |
| 13-Jul-2009 |
James Morris <jmorris@namei.org> |
Merge branch 'master' into next
Conflicts: include/linux/personality.h
Use Linus' version.
Signed-off-by: James Morris <jmorris@namei.org>
|
Revision tags: v2.6.31-rc2 |
|
#
d7e57676 |
| 04-Jul-2009 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'linus' into x86/cleanups
Merge reason: We were on an older pre-rc1 base, move to almost-rc2.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
|
#
c43768cb |
| 04-Jul-2009 |
Tejun Heo <tj@kernel.org> |
Merge branch 'master' into for-next
Pull linus#master to merge PER_CPU_DEF_ATTRIBUTES and alpha build fix changes. As alpha in percpu tree uses 'weak' attribute instead of inline assembly, there's
Merge branch 'master' into for-next
Pull linus#master to merge PER_CPU_DEF_ATTRIBUTES and alpha build fix changes. As alpha in percpu tree uses 'weak' attribute instead of inline assembly, there's no need for __used attribute.
Conflicts: arch/alpha/include/asm/percpu.h arch/mn10300/kernel/vmlinux.lds.S include/linux/percpu-defs.h
show more ...
|
#
5a475ce4 |
| 01-Jul-2009 |
Linus Torvalds <torvalds@linux-foundation.org> |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6: sh: LCDC dcache flush for deferred io sh: Fix compiler error and
Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6: sh: LCDC dcache flush for deferred io sh: Fix compiler error and include the definition of IS_ERR_VALUE sh: re-add LCDC fbdev support to the Migo-R defconfig sh: fix se7724 ceu names sh: ms7724se: Enable sh_eth in defconfig. arch/sh/boards/mach-se/7206/io.c: Remove unnecessary semicolons sh: ms7724se: Add sh_eth support nommu: provide follow_pfn(). sh: Kill off unused DEBUG_BOOTMEM symbol. perf_counter tools: add cpu_relax()/rmb() definitions for sh. sh64: Hook up page fault events for software perf counters. sh: Hook up page fault events for software perf counters. sh: make set_perf_counter_pending() static inline. clocksource: sh_tmu: Make undefined TCOR behaviour less undefined.
show more ...
|
#
ec87805c |
| 29-Jun-2009 |
Kuninori Morimoto <morimoto.kuninori@renesas.com> |
sh: ms7724se: Enable sh_eth in defconfig.
Signed-off-by: Kuninori Morimoto <morimoto.kuninori@renesas.com> Signed-off-by: Paul Mundt <lethal@linux-sh.org>
|
#
348b346b |
| 29-Jun-2009 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'linus' into sched/core
Merge reason: we will merge a dependent patch.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
|