| #
93776a8e |
| 07-Apr-2009 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'linus' into tracing/core
Merge reason: update to upstream tracing facilities
Signed-off-by: Ingo Molnar <mingo@elte.hu>
|
| #
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 ...
|
| #
9efe21cb |
| 06-Apr-2009 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'linus' into irq/threaded
Conflicts:
include/linux/irq.h
kernel/irq/handle.c
|
| #
478c6a43 |
| 05-Apr-2009 |
Len Brown <len.brown@intel.com> |
Merge branch 'linus' into release
Conflicts:
arch/x86/kernel/cpu/cpufreq/longhaul.c
Signed-off-by: Len Brown <len.brown@intel.com>
|
| #
cd02938a |
| 03-Apr-2009 |
Russell King <rmk@dyn-67.arm.linux.org.uk> |
Merge branch 'smsc911x-armplatforms' of git://github.com/steveglen/linux-2.6
|
| #
83f2f0ed |
| 02-Apr-2009 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'linus' into x86/urgent
Merge needed to go past commit 7ca43e756 (mm: use debug_kmap_atomic)
and fix it.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
|
| #
7bee9463 |
| 31-Mar-2009 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'linus' into locking-for-linus
Conflicts:
lib/Kconfig.debug
|
| #
930861c4 |
| 31-Mar-2009 |
Felix Blyakher <felixb@sgi.com> |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
|
| #
65fb0d23 |
| 30-Mar-2009 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'linus' into cpumask-for-linus
Conflicts:
arch/x86/kernel/cpu/common.c
|
| #
ebc8eca1 |
| 30-Mar-2009 |
Linus Torvalds <torvalds@linux-foundation.org> |
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
* 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: (180 commits)
powerpc: clean up ssi.txt, a
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
* 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: (180 commits)
powerpc: clean up ssi.txt, add definition for fsl,ssi-asynchronous
powerpc/85xx: Add support for the "socrates" board (MPC8544).
powerpc: Fix bugs introduced by sysfs changes
powerpc: Sanitize stack pointer in signal handling code
powerpc: Add write barrier before enabling DTL flags
powerpc/83xx: Update ranges in gianfar node to match other dts
powerpc/86xx: Move gianfar mdio nodes under the ethernet nodes
powerpc/85xx: Move gianfar mdio nodes under the ethernet nodes
powerpc/83xx: Move gianfar mdio nodes under the ethernet nodes
powerpc/83xx: Add power management support for MPC837x boards
powerpc/mm: Introduce early_init_mmu() on 64-bit
powerpc/mm: Add option for non-atomic PTE updates to ppc64
powerpc/mm: Fix printk type warning in mmu_context_nohash
powerpc/mm: Rename arch/powerpc/kernel/mmap.c to mmap_64.c
powerpc/mm: Merge various PTE bits and accessors definitions
powerpc/mm: Tweak PTE bit combination definitions
powerpc/cell: Fix iommu exception reporting
powerpc/mm: e300c2/c3/c4 TLB errata workaround
powerpc/mm: Used free register to save a few cycles in SW TLB miss handling
powerpc/mm: Remove unused register usage in SW TLB miss handling
...
show more ...
|
| #
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
|
| #
18ffa418 |
| 26-Mar-2009 |
Ingo Molnar <mingo@elte.hu> |
Merge commit 'v2.6.29' into x86/setup-lzma
|
|
Revision tags: v2.6.29 |
|
| #
37ba1b62 |
| 17-Mar-2009 |
Takashi Iwai <tiwai@suse.de> |
Merge branch 'fix/opl3sa2-suspend' into topic/isa-misc
|
|
Revision tags: v2.6.29-rc8 |
|
| #
d95c3578 |
| 11-Mar-2009 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'x86/core' into cpus4096
|
| #
efdcd41b |
| 09-Mar-2009 |
Takashi Iwai <tiwai@suse.de> |
Merge branch 'topic/vmaster-update' into topic/docbook-fix
|
| #
abcea2c3 |
| 09-Mar-2009 |
Eric Miao <eric.miao@marvell.com> |
Merge branch 'devel' of ssh://master.kernel.org/home/rmk/linux-2.6-arm into devel
|
| #
d15c22e7 |
| 09-Mar-2009 |
Dmitry Torokhov <dmitry.torokhov@gmail.com> |
Merge commit 'v2.6.29-rc7' into next
|
| #
7df4edb0 |
| 05-Mar-2009 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'linus' into core/iommu
|
|
Revision tags: v2.6.29-rc7 |
|
| #
652e8f8d |
| 03-Mar-2009 |
Benjamin Herrenschmidt <benh@kernel.crashing.org> |
Merge commit 'jwb/next' into next
|
| #
c02368a9 |
| 02-Mar-2009 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'linus' into irq/genirq
|
| #
2e31add2 |
| 25-Feb-2009 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'x86/urgent' into x86/pat
|
| #
66a101dd |
| 23-Feb-2009 |
Takashi Iwai <tiwai@suse.de> |
Merge branch 'topic/hwdep-cleanup' into topic/hdsp
|
|
Revision tags: v2.6.29-rc6 |
|
| #
2702e0a4 |
| 22-Feb-2009 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'linus' into timers/hpet
|