#
78f902cc |
| 16-Dec-2008 |
Ingo Molnar <mingo@elte.hu> |
Merge commit 'v2.6.28-rc8' into x86/doc
|
#
dd7a5230 |
| 16-Dec-2008 |
Ingo Molnar <mingo@elte.hu> |
Merge commit 'v2.6.28-rc8' into x86/cpufeature
|
#
72aaf09f |
| 13-Dec-2008 |
Russell King <rmk@dyn-67.arm.linux.org.uk> |
Merge git://git.marvell.com/orion into devel
|
#
fd109027 |
| 12-Dec-2008 |
Ingo Molnar <mingo@elte.hu> |
Merge commit 'v2.6.28-rc8' into x86/irq
|
#
e18d7af8 |
| 12-Dec-2008 |
Ingo Molnar <mingo@elte.hu> |
Merge commit 'v2.6.28-rc8' into x86/mm
|
Revision tags: v2.6.28-rc8 |
|
#
c35fa3ea |
| 08-Dec-2008 |
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
|
#
aa9c9b8c |
| 08-Dec-2008 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'linus' into x86/quirks
|
#
4d117c5c |
| 08-Dec-2008 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'sched/urgent' into sched/core
|
#
14d676f5 |
| 05-Dec-2008 |
Lachlan McIlroy <lachlan@redback.melbourne.sgi.com> |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
|
#
c0515566 |
| 04-Dec-2008 |
Ingo Molnar <mingo@elte.hu> |
Merge commit 'v2.6.28-rc7' into x86/cleanups
|
#
b8307db2 |
| 04-Dec-2008 |
Ingo Molnar <mingo@elte.hu> |
Merge commit 'v2.6.28-rc7' into tracing/core
|
#
cb9c34e6 |
| 04-Dec-2008 |
Ingo Molnar <mingo@elte.hu> |
Merge commit 'v2.6.28-rc7' into core/locking
|
#
ec98ce48 |
| 04-Dec-2008 |
James Morris <jmorris@namei.org> |
Merge branch 'master' into next
Conflicts: fs/nfsd/nfs4recover.c
Manually fixed above to use new creds API functions, e.g. nfs4_save_creds().
Signed-off-by: James Morris <jmorris@namei.org>
|
#
c36910c1 |
| 03-Dec-2008 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'iommu-fixes-2.6.28' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/linux-2.6-iommu into x86/urgent
|
#
52749188 |
| 03-Dec-2008 |
Paul Mackerras <paulus@samba.org> |
Merge branch 'merge'
|
#
dfdc5437 |
| 03-Dec-2008 |
Ingo Molnar <mingo@elte.hu> |
Merge commit 'v2.6.28-rc7'; branch 'x86/dumpstack' into tracing/ftrace
Merge x86/dumpstack into tracing/ftrace because upcoming ftrace changes depend on cleanups already in x86/dumpstack.
Also merg
Merge commit 'v2.6.28-rc7'; branch 'x86/dumpstack' into tracing/ftrace
Merge x86/dumpstack into tracing/ftrace because upcoming ftrace changes depend on cleanups already in x86/dumpstack.
Also merge to latest upstream -rc.
show more ...
|
#
aa2ba5f1 |
| 03-Dec-2008 |
David S. Miller <davem@davemloft.net> |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/ixgbe/ixgbe_main.c drivers/net/smc91x.c
|
#
a64d31ba |
| 02-Dec-2008 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'linus' into cpus4096
Conflicts: kernel/trace/ring_buffer.c
|
Revision tags: v2.6.28-rc7 |
|
#
3af4182c |
| 01-Dec-2008 |
Takashi Iwai <tiwai@suse.de> |
Merge branch 'upstream' into topic/asoc
|
#
03cfdb86 |
| 01-Dec-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: Fix system calls on Cell en
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: Fix system calls on Cell entered with XER.SO=1 powerpc/cell: Fix GDB watchpoints, again powerpc/mpic: Don't reset affinity for secondary MPIC on boot powerpc/cell/axon-msi: Retry on missing interrupt powerpc: Fix boot freeze on machine with empty memory node powerpc: Fix IRQ assignment for some PCIe devices powerpc/spufs: Fix spinning in spufs_ps_fault on signal powerpc/mpc832x_rdb: fix swapped ethernet ids powerpc: Use generic PHY driver for Marvell 88E1111 PHY on GE Fanuc SBC610 powerpc/85xx: L2 cache size wrong in 8572DS dts powerpc/virtex: Update defconfigs powerpc/52xx: update defconfigs xsysace: Fix driver to use resource_size_t instead of unsigned long powerpc/virtex: fix various format/casting printk mismatches powerpc/mpc5200: fix bestcomm Kconfig dependencies powerpc/44x: Fix 460EX/460GT machine check handling powerpc/40x: Limit allocable DRAM during early mapping
show more ...
|
#
11bac8a0 |
| 24-Nov-2008 |
Paul Mackerras <paulus@samba.org> |
Merge branch 'merge' of git://git.secretlab.ca/git/linux-2.6-mpc52xx into merge
|
Revision tags: v2.6.28-rc6, v2.6.28-rc5 |
|
#
c7c2ffb4 |
| 14-Nov-2008 |
Grant Likely <grant.likely@secretlab.ca> |
powerpc/52xx: update defconfigs
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
|
Revision tags: v2.6.28-rc4, v2.6.28-rc3, v2.6.28-rc2, v2.6.28-rc1, v2.6.27, v2.6.27-rc9, v2.6.27-rc8, v2.6.27-rc7, v2.6.27-rc6, v2.6.27-rc5, v2.6.27-rc4, v2.6.27-rc3, v2.6.27-rc2, 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, v2.6.25, v2.6.25-rc9, v2.6.25-rc8, v2.6.25-rc7, v2.6.25-rc6, v2.6.25-rc5, v2.6.25-rc4, v2.6.25-rc3, v2.6.25-rc2, v2.6.25-rc1 |
|
#
c1f3ee12 |
| 03-Feb-2008 |
David Woodhouse <dwmw2@infradead.org> |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
|
#
8af03e78 |
| 31-Jan-2008 |
Linus Torvalds <torvalds@linux-foundation.org> |
Merge branch 'for-2.6.25' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
* 'for-2.6.25' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc: (454 commits) [POWERPC] Ce
Merge branch 'for-2.6.25' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
* 'for-2.6.25' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc: (454 commits) [POWERPC] Cell IOMMU fixed mapping support [POWERPC] Split out the ioid fetching/checking logic [POWERPC] Add support to cell_iommu_setup_page_tables() for multiple windows [POWERPC] Split out the IOMMU logic from cell_dma_dev_setup() [POWERPC] Split cell_iommu_setup_hardware() into two parts [POWERPC] Split out the logic that allocates struct iommus [POWERPC] Allocate the hash table under 1G on cell [POWERPC] Add set_dma_ops() to match get_dma_ops() [POWERPC] 83xx: Clean up / convert mpc83xx board DTS files to v1 format. [POWERPC] 85xx: Only invalidate TLB0 and TLB1 [POWERPC] 83xx: Fix typo in mpc837x compatible entries [POWERPC] 85xx: convert sbc85* boards to use machine_device_initcall [POWERPC] 83xx: rework platform Kconfig [POWERPC] 85xx: rework platform Kconfig [POWERPC] 86xx: Remove unused IRQ defines [POWERPC] QE: Explicitly set address-cells and size cells for muram [POWERPC] Convert StorCenter DTS file to /dts-v1/ format. [POWERPC] 86xx: Convert all 86xx DTS files to /dts-v1/ format. [PPC] Remove 85xx from arch/ppc [PPC] Remove 83xx from arch/ppc ...
show more ...
|
Revision tags: v2.6.24 |
|
#
0a0a5af3 |
| 21-Jan-2008 |
Grant Likely <grant.likely@secretlab.ca> |
[POWERPC] mpc5200: merge defconfigs for all mpc5200 boards
There is no reason to have separate defconfigs for each mpc5200 board. Instead, here is a common defconfig that can be used for all support
[POWERPC] mpc5200: merge defconfigs for all mpc5200 boards
There is no reason to have separate defconfigs for each mpc5200 board. Instead, here is a common defconfig that can be used for all supported platforms.
Merging the defconfigs means there are fewer configuration to test when compile testing all of arch/powerpc and should make support easier.
Supported boards: Lite5200(b), Efika, TQM5200, CM5200, MotionPro
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
show more ...
|