forge/linux-pinenote
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
linux-pinenote/arch/powerpc/platforms
History
Ingo Molnar 5ea472a77f Merge commit 'v2.6.30-rc1' into perfcounters/core 
Conflicts:
	arch/powerpc/include/asm/systbl.h
	arch/powerpc/include/asm/unistd.h
	include/linux/init_task.h

Merge reason: the conflicts are non-trivial: PowerPC placement
              of sys_perf_counter_open has to be mixed with the
	      new preadv/pwrite syscalls.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
2009-04-08 10:35:30 +02:00
..
8xx cpumask: remove references to struct irqaction's mask field. 2009-03-30 22:05:14 +10:30
40x powerpc: Introduce ppc_pci_flags accessors 2008-12-16 15:53:16 +11:00
44x AMCC PPC 460SX redwood SoC platform initial framework 2009-02-14 14:41:29 -05:00
52xx Merge commit 'gcl/next' into next 2009-03-20 16:27:57 +11:00
82xx powerpc/kconfig: Kill PPC_MULTIPLATFORM 2009-03-11 17:11:35 +11:00
83xx powerpc/fsl_soc: isolate legacy fsl_spi support to mpc832x_rdb boards 2009-04-01 08:59:23 -07:00
85xx Merge git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-cpumask 2009-03-30 18:00:26 -07:00
86xx powerpc/86xx: Move gianfar mdio nodes under the ethernet nodes 2009-03-24 08:35:18 -05:00
512x powerpc/kconfig: Kill PPC_MULTIPLATFORM 2009-03-11 17:11:35 +11:00
amigaone powerpc/kconfig: Kill PPC_MULTIPLATFORM 2009-03-11 17:11:35 +11:00
cell dma-mapping: replace all DMA_64BIT_MASK macro with DMA_BIT_MASK(64) 2009-04-07 08:31:10 -07:00
chrp Merge git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-cpumask 2009-03-30 18:00:26 -07:00
embedded6xx Merge commit 'origin/master' into next 2009-03-24 13:38:30 +11:00
iseries dma-mapping: replace all DMA_32BIT_MASK macro with DMA_BIT_MASK(32) 2009-04-07 08:31:11 -07:00
maple powerpc/kconfig: Kill PPC_MULTIPLATFORM 2009-03-11 17:11:35 +11:00
pasemi powerpc/kconfig: Kill PPC_MULTIPLATFORM 2009-03-11 17:11:35 +11:00
powermac Merge git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-cpumask 2009-03-30 18:00:26 -07:00
prep powerpc/kconfig: Kill PPC_MULTIPLATFORM 2009-03-11 17:11:35 +11:00
ps3 dma-mapping: replace all DMA_32BIT_MASK macro with DMA_BIT_MASK(32) 2009-04-07 08:31:11 -07:00
pseries Merge commit 'origin/master' into next 2009-03-30 14:04:53 +11:00
fsl_uli1575.c powerpc: Fix the ide suspend function in uli1575 2009-01-07 09:18:52 -06:00
Kconfig Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial 2009-04-03 15:24:35 -07:00
Kconfig.cputype Merge branch 'linus' into perfcounters/core-v2 2009-04-06 09:02:57 +02:00
Makefile powerpc/amigaone: Add platform support for AmigaOne 2009-02-11 16:00:08 +11:00