Linus Torvalds 773d7a09e1 Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc ... * 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: (35 commits) powerpc/5121: make clock debug output more readable powerpc/5xxx: Add common mpc5xxx_get_bus_frequency() function powerpc/5200: Update pcm030.dts to add i2c eeprom and delete cruft powerpc/5200: convert mpc52xx_psc_spi to use cs_control callback fbdev/xilinxfb: Fix improper casting and tighen up probe path usb/ps3: Add missing annotations powerpc: Add memory clobber to mtspr() powerpc: Fix invalid construct in our CPU selection Kconfig ps3rom: Use ps3_system_bus_[gs]et_drvdata() instead of direct access powerpc: Add configurable -Werror for arch/powerpc of_serial: Add UPF_FIXED_TYPE flag drivers/hvc: Add missing __devexit_p() net/ps3: gelic - Add missing annotations powerpc: Introduce macro spin_event_timeout() powerpc/warp: Fix ISA_DMA_THRESHOLD default powerpc/bootwrapper: Custom build options for XPedite52xx targets powerpc/85xx: Add defconfig for X-ES MPC85xx boards powerpc/85xx: Add dts files for X-ES MPC85xx boards powerpc/85xx: Add platform support for X-ES MPC85xx boards 83xx: add support for the kmeter1 board. ...		2009-06-19 17:40:40 -07:00
..
8xx	powerpc/cpm: Remove some cruft code and defines	2009-05-19 00:47:19 -05:00
40x	Merge commit 'jwb/next' into next	2009-06-12 10:35:52 +10:00
44x	powerpc/warp: Fix ISA_DMA_THRESHOLD default	2009-06-16 14:15:44 +10:00
52xx	powerpc/5xxx: Add common mpc5xxx_get_bus_frequency() function	2009-06-17 00:30:22 -06:00
82xx	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6	2009-06-15 09:40:05 -07:00
83xx	83xx: add support for the kmeter1 board.	2009-06-15 22:15:09 -05:00
85xx	powerpc/85xx: Add platform support for X-ES MPC85xx boards	2009-06-15 22:15:13 -05:00
86xx	Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc	2009-06-19 17:40:40 -07:00
512x	powerpc/5121: make clock debug output more readable	2009-06-17 01:24:10 -06:00
amigaone	powerpc/kconfig: Kill PPC_MULTIPLATFORM	2009-03-11 17:11:35 +11:00
cell	Merge branch 'akpm'	2009-06-16 19:50:13 -07:00
chrp	powerpc/pci: Clean up direct access to sysdata by CHRP platforms	2009-05-21 15:44:23 +10:00
embedded6xx	Merge commit 'origin/master' into next	2009-03-24 13:38:30 +11:00
iseries	powerpc/iseries: Mark signal_vsp_instruction() as maybe unused	2009-06-15 13:27:37 +10:00
maple	edac: cpc925 MC platform device setup	2009-06-18 13:03:57 -07:00
pasemi	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2009-05-18 21:08:20 -07:00
powermac	powerpc/pci: Clean up direct access to sysdata by powermac platforms	2009-05-21 15:44:23 +10:00
prep	powerpc/kconfig: Kill PPC_MULTIPLATFORM	2009-03-11 17:11:35 +11:00
ps3	ps3: Replace direct file operations by callback	2009-06-15 16:47:26 +10:00
pseries	Merge commit 'origin/master' into next	2009-06-12 16:53:38 +10:00
fsl_uli1575.c	powerpc/85xx: Add P2020DS board support	2009-05-19 00:50:43 -05:00
Kconfig	powerpc/virtex: Add support for Xilinx PCI host bridge	2009-06-06 10:14:22 -06:00
Kconfig.cputype	powerpc: Fix invalid construct in our CPU selection Kconfig	2009-06-16 14:15:46 +10:00
Makefile	powerpc: Add configurable -Werror for arch/powerpc	2009-06-16 14:15:45 +10:00