summaryrefslogtreecommitdiffstats
path: root/arch/powerpc/platforms
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'linus' into perfcounters/coreIngo Molnar2009-06-011-0/+14
|\
| * powerpc/maple: Add a quirk to disable MSI for IPR on BiminiMichael Ellerman2009-05-221-0/+14
* | Merge commit 'v2.6.30-rc6' into perfcounters/coreIngo Molnar2009-05-186-5/+22
|\ \ | |/
| * Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-blockLinus Torvalds2009-05-151-0/+1
| |\
| | * viocd: needs to depend on BLOCKAlexander Beregalov2009-05-121-0/+1
| * | powerpc/cell: Make ptcal more reliableGerhard Stenzel2009-05-151-3/+14
| * | powerpc/iseries: Fix pci breakage due to bad dma_data initializationStephen Rothwell x2009-05-152-2/+5
| * | powerpc/virtex: Add uImage to the default images listGrant Likely2009-05-142-0/+2
| |/
* | Merge branch 'linus' into perfcounters/coreIngo Molnar2009-04-297-15/+8
|\ \ | |/
| * powerpc/ps3: Fix build error on UPGeoff Levand2009-04-281-4/+0
| * powerpc/cell: Select PCI for IBM_CELL_BLADE AND CELLEBMichael Ellerman2009-04-281-1/+4
| * powerpc/pasemi: Fix build error on UPGeoff Levand2009-04-221-4/+0
| * powerpc/ps3: Fix CONFIG_PS3_FLASH=n build warningGeoff Levand2009-04-221-1/+1
| * Merge branch 'merge' of git://git.secretlab.ca/git/linux-2.6 into mergePaul Mackerras2009-04-223-4/+4
| |\
| * | powerpc: don't disable SATA interrupts on Freescale MPC8610 HPCDTimur Tabi2009-04-211-5/+0
| * | powerpc: pseries/dtl.c should include asm/firmware.hSachin Sant2009-04-151-0/+1
| * | powerpc/pseries: Set error_state to pci_channel_io_normal in eeh_report_reset()Mike Mason2009-04-151-0/+2
* | | Merge commit 'v2.6.30-rc1' into perfcounters/coreIngo Molnar2009-04-083-4/+4
|\ \ \ | | |/ | |/|
| * | dma-mapping: replace all DMA_32BIT_MASK macro with DMA_BIT_MASK(32)Yang Hongyang2009-04-072-3/+3
| * | dma-mapping: replace all DMA_64BIT_MASK macro with DMA_BIT_MASK(64)Yang Hongyang2009-04-071-1/+1
| |/
* | Merge branch 'linus' into perfcounters/core-v2Ingo Molnar2009-04-06101-551/+2943
|\ \ | |/
| * Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jik...Linus Torvalds2009-04-031-1/+1
| |\
| | * trivial: fix typos/grammar errors in Kconfig textsMatt LaPlante2009-03-301-1/+1
| * | Merge git://git.kernel.org/pub/scm/linux/kernel/git/kyle/rtc-pariscLinus Torvalds2009-04-034-18/+14
| |\ \
| | * | powerpc/ps3: Add rtc-ps3Geert Uytterhoeven2009-04-024-18/+14
| * | | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vir...Linus Torvalds2009-04-021-1/+1
| |\ \ \ | | |/ / | |/| |
| | * | New helper - current_umask()Al Viro2009-03-311-1/+1
| * | | powerpc/fsl_soc: isolate legacy fsl_spi support to mpc832x_rdb boardsAnton Vorontsov2009-04-011-0/+107
| * | | powerpc/83xx: add mmc-spi support via the device tree for MPC8323E-RDBAnton Vorontsov2009-04-011-0/+6
| * | | spi_mpc83xx: rework chip selects handlingAnton Vorontsov2009-04-011-12/+4
| |/ /
| * | Merge git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-cpumaskLinus Torvalds2009-03-305-6/+0
| |\ \
| | * | cpumask: remove references to struct irqaction's mask field.Rusty Russell2009-03-305-6/+0
| | |/
| * | Merge commit 'origin/master' into nextBenjamin Herrenschmidt2009-03-304-8/+7
| |\ \ | | |/
| | * Merge branch 'core/percpu' into percpu-cpumask-x86-for-linus-2Ingo Molnar2009-03-271-2/+3
| | |\
| | * \ Merge branch 'irq-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...Linus Torvalds2009-03-261-3/+1
| | |\ \
| | | * \ Merge branches 'irq/sparseirq' and 'linus' into irq/coreIngo Molnar2009-03-231-0/+7
| | | |\ \
| | | * | | sparseirq, powerpc/cell: fix unused variable warning in interrupt.cStephen Rothwell2009-03-161-2/+0
| | | * | | Merge branches 'irq/genirq' and 'linus' into irq/coreIngo Molnar2009-03-164-71/+5
| | | |\ \ \
| | | | \ \ \
| | | | \ \ \
| | | | \ \ \
| | | | \ \ \
| | | *---. \ \ \ Merge branches 'irq/genirq', 'irq/sparseirq' and 'irq/urgent' into irq/coreIngo Molnar2009-02-131-1/+1
| | | |\ \ \ \ \ \
| | | | | * | | | | sparseirq: use kstat_irqs_cpu insteadYinghai Lu2009-01-111-1/+1
| | * | | | | | | | Merge branch 'timers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/...Linus Torvalds2009-03-261-1/+1
| | |\ \ \ \ \ \ \ \
| | | | \ \ \ \ \ \ \
| | | | \ \ \ \ \ \ \
| | | *-. \ \ \ \ \ \ \ Merge branches 'timers/new-apis', 'timers/ntp' and 'timers/urgent' into timer...Ingo Molnar2009-03-261-1/+1
| | | |\ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|/ / | | | |/| | | | | | | |
| | | | * | | | | | | | timers: add mod_timer_pending()Ingo Molnar2009-02-181-1/+1
| | | | |/ / / / / / /
| | * | | | | | | | | PS3: replace bus_id usageGreg Kroah-Hartman2009-03-241-2/+2
| | |/ / / / / / / /
| * | | | | | | | | Merge commit 'kumar/next' into nextBenjamin Herrenschmidt2009-03-3027-0/+505
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | powerpc/85xx: Add support for the "socrates" board (MPC8544).Wolfgang Grandegger2009-03-275-0/+483
| | * | | | | | | | | powerpc/86xx: Move gianfar mdio nodes under the ethernet nodesAnton Vorontsov2009-03-246-0/+6
| | * | | | | | | | | powerpc/85xx: Move gianfar mdio nodes under the ethernet nodesAnton Vorontsov2009-03-2410-0/+10
| | * | | | | | | | | powerpc/83xx: Move gianfar mdio nodes under the ethernet nodesAnton Vorontsov2009-03-246-0/+6
| * | | | | | | | | | powerpc: Add write barrier before enabling DTL flagsJeremy Kerr2009-03-271-0/+4
| |/ / / / / / / / /
OpenPOWER on IntegriCloud