#
0ce1c383 |
| 20-Jan-2009 |
Ingo Molnar <mingo@elte.hu> |
Merge commit 'v2.6.29-rc2' into x86/mm
|
#
4092762a |
| 18-Jan-2009 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'tracing/ftrace'; commit 'v2.6.29-rc2' into tracing/core
|
#
b2b062b8 |
| 18-Jan-2009 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'core/percpu' into stackprotector
Conflicts: arch/x86/include/asm/pda.h arch/x86/include/asm/system.h
Also, moved include/asm-x86/stackprotector.h to arch/x86/include/asm.
Signed-of
Merge branch 'core/percpu' into stackprotector
Conflicts: arch/x86/include/asm/pda.h arch/x86/include/asm/system.h
Also, moved include/asm-x86/stackprotector.h to arch/x86/include/asm.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
show more ...
|
#
af37501c |
| 18-Jan-2009 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'core/percpu' into perfcounters/core
Conflicts: arch/x86/include/asm/pda.h
We merge tip/core/percpu into tip/perfcounters/core because of a semantic and contextual conflict: the forme
Merge branch 'core/percpu' into perfcounters/core
Conflicts: arch/x86/include/asm/pda.h
We merge tip/core/percpu into tip/perfcounters/core because of a semantic and contextual conflict: the former eliminates the PDA, while the latter extends it with apic_perf_irqs field.
Resolve the conflict by moving the new field to the irq_cpustat structure on 64-bit too.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
show more ...
|
#
d1a02005 |
| 17-Jan-2009 |
Takashi Iwai <tiwai@suse.de> |
Merge branch 'topic/usb-mixer-cache' into next/usb-audio
|
Revision tags: v2.6.29-rc2 |
|
#
5a2dd72a |
| 16-Jan-2009 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'linus' into irq/genirq
|
#
af2519fb |
| 16-Jan-2009 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'linus' into core/iommu
Conflicts: arch/ia64/include/asm/dma-mapping.h arch/ia64/include/asm/machvec.h arch/ia64/include/asm/machvec_sn2.h
|
#
c0106d72 |
| 15-Jan-2009 |
Takashi Iwai <tiwai@suse.de> |
Merge branch 'topic/asoc' into next/asoc
|
#
49a93bc9 |
| 15-Jan-2009 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'linus' into cpus4096
|
#
cb7a97d0 |
| 14-Jan-2009 |
Lachlan McIlroy <lachlan@redback.melbourne.sgi.com> |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-linus
|
#
c088f4e9 |
| 14-Jan-2009 |
Lachlan McIlroy <lachlan@redback.melbourne.sgi.com> |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
|
#
54c26687 |
| 13-Jan-2009 |
Linus Torvalds <torvalds@linux-foundation.org> |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6: sparc: Fix asm/signal.h for 32-bit. sparc: Eliminate PROMLIB_
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6: sparc: Fix asm/signal.h for 32-bit. sparc: Eliminate PROMLIB_INTERNAL as it does nothing sparc: Kill exports of prom internal functions sparc64: move EXPORT_SYMBOL to the symbols definition sparc: move EXPORT_SYMBOL to the symbols definition sparc: Create a new file lib/ksyms.c and add export of all symbols defined in assembler in lib/ to this file. sparc: Most unaligned_64.c tweaks for branch tracer warnings. sparc: Fix sun4d_irq.c build. sparc: Update 32-bit defconfig. sparc64: fix warnings in psycho_common after ull conversion
show more ...
|
#
e3ee1e12 |
| 12-Jan-2009 |
Ingo Molnar <mingo@elte.hu> |
Merge commit 'v2.6.29-rc1' into timers/hrtimers
Conflicts: kernel/time/tick-common.c
|
#
506c10f2 |
| 11-Jan-2009 |
Ingo Molnar <mingo@elte.hu> |
Merge commit 'v2.6.29-rc1' into perfcounters/core
Conflicts: include/linux/kernel_stat.h
|
Revision tags: v2.6.29-rc1 |
|
#
b2576e1d |
| 09-Jan-2009 |
Len Brown <len.brown@intel.com> |
Merge branch 'linus' into release
|
#
bc835978 |
| 09-Jan-2009 |
Julian Calaby <julian.calaby@gmail.com> |
sparc: Kill exports of prom internal functions
__prom_getchild() and __prom_getsibling() are not used anywhere, so don't export them.
Signed-off-by: Julian Calaby <julian.calaby@gmail.com> Signed-o
sparc: Kill exports of prom internal functions
__prom_getchild() and __prom_getsibling() are not used anywhere, so don't export them.
Signed-off-by: Julian Calaby <julian.calaby@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
show more ...
|
#
917c3660 |
| 09-Jan-2009 |
Sam Ravnborg <sam@ravnborg.org> |
sparc64: move EXPORT_SYMBOL to the symbols definition
Move all applicable EXPORT_SYMBOL()s to the file where the respective symbol is defined.
Removed all the includes that are no longer needed in
sparc64: move EXPORT_SYMBOL to the symbols definition
Move all applicable EXPORT_SYMBOL()s to the file where the respective symbol is defined.
Removed all the includes that are no longer needed in sparc_ksyms_64.c
Comment all remaining EXPORT_SYMBOL()s in sparc_ksyms_64.c
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Additions by Julian Calaby: * Moved EXPORT_SYMBOL()s for prom functions to their rightful places. * Made some minor cleanups to the includes and comments of sparc_ksyms_64.c * Updated and tidied commit message. * Rebased patch over sparc-2.6.git HEAD. * Ensured that all modified files have the correct includes.
Signed-off-by: Julian Calaby <julian.calaby@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
show more ...
|
#
6206aa8b |
| 08-Jan-2009 |
Lachlan McIlroy <lachlan@redback.melbourne.sgi.com> |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
|
#
353816f4 |
| 05-Jan-2009 |
David Woodhouse <David.Woodhouse@intel.com> |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts: arch/arm/mach-pxa/corgi.c arch/arm/mach-pxa/poodle.c arch/arm/mach-pxa/spitz.c
|
#
7eb19553 |
| 01-Jan-2009 |
Mike Travis <travis@sgi.com> |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-cpumask into merge-rr-cpumask
Conflicts: arch/x86/kernel/io_apic.c kernel/rcuclassic.c kernel/sched.c kerne
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-cpumask into merge-rr-cpumask
Conflicts: arch/x86/kernel/io_apic.c kernel/rcuclassic.c kernel/sched.c kernel/time/tick-sched.c
Signed-off-by: Mike Travis <travis@sgi.com> [ mingo@elte.hu: backmerged typo fix for io_apic.c ] Signed-off-by: Ingo Molnar <mingo@elte.hu>
show more ...
|
#
923a789b |
| 02-Jan-2009 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'linus' into x86/cleanups
Conflicts: arch/x86/kernel/reboot.c
|
#
b21a2071 |
| 02-Jan-2009 |
David Vrabel <david.vrabel@csr.com> |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-upstream
Conflicts:
drivers/uwb/wlp/eda.c
|
#
418f19ea |
| 31-Dec-2008 |
Pierre Ossman <drzeus@drzeus.cx> |
Merge branch 'master' of ../mmc
|
#
2ca1a615 |
| 31-Dec-2008 |
Rusty Russell <rusty@rustcorp.com.au> |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
arch/x86/kernel/io_apic.c
|
#
a9de18eb |
| 31-Dec-2008 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'linus' into stackprotector
Conflicts: arch/x86/include/asm/pda.h kernel/fork.c
|