#
2879a927 |
| 19-Aug-2008 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'x86/oprofile' into oprofile
|
#
f3efbe58 |
| 15-Aug-2008 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'linus' into x86/gart
|
#
04197c83 |
| 15-Aug-2008 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'linus' into x86/tracehook
Conflicts: arch/x86/Kconfig
Signed-off-by: Ingo Molnar <mingo@elte.hu>
|
#
1a103907 |
| 15-Aug-2008 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'linus' into x86/cpu
|
#
5aa37e4f |
| 15-Aug-2008 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'x86/core' into x86/apic
|
#
51ca3c67 |
| 14-Aug-2008 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'linus' into x86/core
Conflicts: arch/x86/kernel/genapic_64.c include/asm-x86/kvm_host.h
Signed-off-by: Ingo Molnar <mingo@elte.hu>
|
#
8d7ccaa5 |
| 14-Aug-2008 |
Ingo Molnar <mingo@elte.hu> |
Merge commit 'v2.6.27-rc3' into x86/prototypes
Conflicts:
include/asm-x86/dma-mapping.h
Signed-off-by: Ingo Molnar <mingo@elte.hu>
|
#
d4439087 |
| 14-Aug-2008 |
Ingo Molnar <mingo@elte.hu> |
Merge commit 'v2.6.27-rc3' into x86/xsave
Conflicts:
arch/x86/kernel/genapic_64.c include/asm-x86/kvm_host.h
Signed-off-by: Ingo Molnar <mingo@elte.hu>
|
#
73909f7a |
| 13-Aug-2008 |
Ingo Molnar <mingo@elte.hu> |
Merge commit 'v2.6.27-rc3' into core/urgent
|
#
a12e61df |
| 13-Aug-2008 |
Ingo Molnar <mingo@elte.hu> |
Merge commit 'v2.6.27-rc3' into x86/urgent
|
Revision tags: v2.6.27-rc3 |
|
#
742c5253 |
| 12-Aug-2008 |
David Woodhouse <David.Woodhouse@intel.com> |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
include/asm-arm/arch-omap/onenand.h
|
#
f2556896 |
| 11-Aug-2008 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'linus' into x86/defconfig
|
#
e2205a15 |
| 11-Aug-2008 |
Linus Torvalds <torvalds@linux-foundation.org> |
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc: powerpc: Remove include/linux/harrie
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc: powerpc: Remove include/linux/harrier_defs.h powerpc: Do not ignore arch/powerpc/include powerpc: Delete completed "ppc removal" task from feature removal file powerpc/mm: Fix attribute confusion with htab_bolt_mapping() powerpc/pci: Don't keep ISA memory hole resources in the tree powerpc: Zero fill the return values of rtas argument buffer powerpc/4xx: Update defconfig files for 2.6.27-rc1 powerpc/44x: Incorrect NOR offset in Warp DTS powerpc/44x: Warp DTS changes for board updates powerpc/4xx: Cleanup Warp for i2c driver changes. powerpc/44x: Adjust warp-nand resource end address
show more ...
|
Revision tags: v2.6.27-rc2 |
|
#
9ea7d5ad |
| 06-Aug-2008 |
Josh Boyer <jwboyer@linux.vnet.ibm.com> |
powerpc/4xx: Update defconfig files for 2.6.27-rc1
Update the defconfig files for 4xx boards. This also makes the mutli-board defconfigs a bit more useful by enabling some of the more common module
powerpc/4xx: Update defconfig files for 2.6.27-rc1
Update the defconfig files for 4xx boards. This also makes the mutli-board defconfigs a bit more useful by enabling some of the more common modules.
Signed-off-by: Josh Boyer <jwboyer@linux.vnet.ibm.com>
show more ...
|
Revision tags: v2.6.27-rc1, v2.6.26, v2.6.26-rc9, v2.6.26-rc8, v2.6.26-rc7, v2.6.26-rc6, v2.6.26-rc5, v2.6.26-rc4, v2.6.26-rc3, v2.6.26-rc2, v2.6.26-rc1 |
|
#
96916090 |
| 30-Apr-2008 |
Len Brown <len.brown@intel.com> |
Merge branches 'release', 'acpica', 'bugzilla-10224', 'bugzilla-9772', 'bugzilla-9916', 'ec', 'eeepc', 'idle', 'misc', 'pm-legacy', 'sysfs-links-2.6.26', 'thermal', 'thinkpad' and 'video' into release
|
#
36d99df2 |
| 24-Apr-2008 |
Steve French <sfrench@us.ibm.com> |
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
|
#
f838bad1 |
| 22-Apr-2008 |
David Woodhouse <dwmw2@infradead.org> |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
|
#
9a64388d |
| 22-Apr-2008 |
Linus Torvalds <torvalds@linux-foundation.org> |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
* 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc: (202 commits) [POWERPC] Fix compil
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
* 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc: (202 commits) [POWERPC] Fix compile breakage for 64-bit UP configs [POWERPC] Define copy_siginfo_from_user32 [POWERPC] Add compat handler for PTRACE_GETSIGINFO [POWERPC] i2c: Fix build breakage introduced by OF helpers [POWERPC] Optimize fls64() on 64-bit processors [POWERPC] irqtrace support for 64-bit powerpc [POWERPC] Stacktrace support for lockdep [POWERPC] Move stackframe definitions to common header [POWERPC] Fix device-tree locking vs. interrupts [POWERPC] Make pci_bus_to_host()'s struct pci_bus * argument const [POWERPC] Remove unused __max_memory variable [POWERPC] Simplify xics direct/lpar irq_host setup [POWERPC] Use pseries_setup_i8259_cascade() in pseries_mpic_init_IRQ() [POWERPC] Turn xics_setup_8259_cascade() into a generic pseries_setup_i8259_cascade() [POWERPC] Move xics_setup_8259_cascade() into platforms/pseries/setup.c [POWERPC] Use asm-generic/bitops/find.h in bitops.h [POWERPC] 83xx: mpc8315 - fix USB UTMI Host setup [POWERPC] 85xx: Fix the size of qe muram for MPC8568E [POWERPC] 86xx: mpc86xx_hpcn - Temporarily accept old dts node identifier. [POWERPC] 86xx: mark functions static, other minor cleanups ...
show more ...
|
Revision tags: v2.6.25, v2.6.25-rc9 |
|
#
975386ee |
| 06-Apr-2008 |
Josh Boyer <jwboyer@linux.vnet.ibm.com> |
[POWERPC] 4xx: Reorganize 4xx defconfigs
Board specific defconfigs are useful, however with the ability to do multi-board defconfigs they aren't needed in the top level configs directory.
Move the
[POWERPC] 4xx: Reorganize 4xx defconfigs
Board specific defconfigs are useful, however with the ability to do multi-board defconfigs they aren't needed in the top level configs directory.
Move the 4xx board specific defconfigs to individual directories under arch/powerpc/configs.
Signed-off-by: Josh Boyer <jwboyer@linux.vnet.ibm.com>
show more ...
|