#
bbb20089 |
| 08-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
|
#
08229de4 |
| 15-Aug-2009 |
Mark Brown <broonie@opensource.wolfsonmicro.com> |
Merge branch 'for-2.6.32' into mxc
Conflicts: sound/soc/Makefile
|
#
bd072111 |
| 22-Jul-2009 |
Dmitry Torokhov <dmitry.torokhov@gmail.com> |
Merge commit 'v2.6.31-rc4' into next
|
#
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 ...
|
#
d905163c |
| 18-Jun-2009 |
James Morris <jmorris@namei.org> |
Merge branch 'master' into next
|
#
cc4949e1 |
| 17-Jun-2009 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'linus' into x86/urgent
Merge reason: pull in latest to fix a bug in it.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
|
#
722f2a6c |
| 15-Jun-2009 |
Vegard Nossum <vegard.nossum@gmail.com> |
Merge commit 'linus/master' into HEAD
Conflicts: MAINTAINERS
Signed-off-by: Vegard Nossum <vegard.nossum@gmail.com>
|
#
9cbc1cb8 |
| 15-Jun-2009 |
David S. Miller <davem@davemloft.net> |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts: Documentation/feature-removal-schedule.txt drivers/scsi/fcoe/fcoe.c net/core/drop_monitor.c net
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts: Documentation/feature-removal-schedule.txt drivers/scsi/fcoe/fcoe.c net/core/drop_monitor.c net/core/net-traces.c
show more ...
|
#
7dafd239 |
| 14-Jun-2009 |
Benjamin Herrenschmidt <benh@kernel.crashing.org> |
Merge commit 'origin/master' into next
|
#
bff7b55b |
| 14-Jun-2009 |
Paul Mundt <lethal@linux-sh.org> |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
|
#
d645727b |
| 12-Jun-2009 |
Linus Torvalds <torvalds@linux-foundation.org> |
Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6
* 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6: (30 commits) [S390] wire up sys_perf_counter_open [S390] wire up
Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6
* 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6: (30 commits) [S390] wire up sys_perf_counter_open [S390] wire up sys_rt_tgsigqueueinfo [S390] ftrace: add system call tracer support [S390] ftrace: add function graph tracer support [S390] ftrace: add function trace mcount test support [S390] ftrace: add dynamic ftrace support [S390] kprobes: use probe_kernel_write [S390] maccess: arch specific probe_kernel_write() implementation [S390] maccess: add weak attribute to probe_kernel_write [S390] profile_tick called twice [S390] dasd: forward internal errors to dasd_sleep_on caller [S390] dasd: sync after async probe [S390] dasd: check_characteristics cleanup [S390] dasd: no High Performance FICON in 31-bit mode [S390] dcssblk: revert devt conversion [S390] qdio: fix access beyond ARRAY_SIZE of irq_ptr->{in,out}put_qs [S390] vmalloc: add vmalloc kernel parameter support [S390] uaccess: use might_fault() instead of might_sleep() [S390] 3270: lock dependency fixes [S390] 3270: do not register with tty_register_device ...
show more ...
|
#
88dbd203 |
| 12-Jun-2009 |
Heiko Carstens <heiko.carstens@de.ibm.com> |
[S390] ftrace: add function graph tracer support
Function graph tracer support for s390.
Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com> Signed-off-by: Martin Schwidefsky <schwidefsky@de.
[S390] ftrace: add function graph tracer support
Function graph tracer support for s390.
Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com> Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
show more ...
|
#
8b4488f8 |
| 12-Jun-2009 |
Heiko Carstens <heiko.carstens@de.ibm.com> |
[S390] ftrace: add function trace mcount test support
Add support for early test if the function tracer is enabled or disabled. Saves some extra function calls.
Signed-off-by: Heiko Carstens <heiko
[S390] ftrace: add function trace mcount test support
Add support for early test if the function tracer is enabled or disabled. Saves some extra function calls.
Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com> Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
show more ...
|
#
dfd9f7ab |
| 12-Jun-2009 |
Heiko Carstens <heiko.carstens@de.ibm.com> |
[S390] ftrace: add dynamic ftrace support
Dynamic ftrace support for s390.
Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com> Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
|
Revision tags: v2.6.30, v2.6.30-rc8, v2.6.30-rc7, v2.6.30-rc6 |
|
#
d585a021 |
| 08-May-2009 |
Dmitry Torokhov <dmitry.torokhov@gmail.com> |
Merge commit 'v2.6.30-rc5' into next
|
Revision tags: v2.6.30-rc5 |
|
#
3a20ac2c |
| 04-May-2009 |
Takashi Iwai <tiwai@suse.de> |
Merge branch 'fix/pcm-jiffies-check' into fix/asoc
|
Revision tags: v2.6.30-rc4, v2.6.30-rc3, v2.6.30-rc2 |
|
#
6967963d |
| 14-Apr-2009 |
Mark Brown <broonie@opensource.wolfsonmicro.com> |
Merge branch 'for-2.6.30' into for-2.6.31
|
#
5af8c4e0 |
| 08-Apr-2009 |
Ingo Molnar <mingo@elte.hu> |
Merge commit 'v2.6.30-rc1' into sched/urgent
Merge reason: update to latest upstream to queue up fix
Signed-off-by: Ingo Molnar <mingo@elte.hu>
|
Revision tags: v2.6.30-rc1 |
|
#
2e8844e1 |
| 07-Apr-2009 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'linus' into tracing/hw-branch-tracing
Merge reason: update to latest tracing and ptrace APIs
Signed-off-by: Ingo Molnar <mingo@elte.hu>
|
#
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 ...
|
#
7bee9463 |
| 31-Mar-2009 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'linus' into locking-for-linus
Conflicts: lib/Kconfig.debug
|
#
65fb0d23 |
| 30-Mar-2009 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'linus' into cpumask-for-linus
Conflicts: arch/x86/kernel/cpu/common.c
|
#
90f959bc |
| 28-Mar-2009 |
Dave Airlie <airlied@redhat.com> |
drm: merge Linux master into HEAD
Conflicts: drivers/gpu/drm/drm_info.c drivers/gpu/drm/drm_proc.c drivers/gpu/drm/i915/i915_gem_debugfs.c
|