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
..
alpha	Delete pcibios_select_root	2009-06-17 14:04:42 -07:00
arm	Delete pcibios_select_root	2009-06-17 14:04:42 -07:00
avr32	ptrace: remove PT_DTRACE from avr32, mn10300, parisc, s390, sh, xtensa	2009-06-18 13:03:48 -07:00
blackfin	Blackfin: convert page/tlb to asm-generic	2009-06-18 21:42:30 -04:00
cris	kmap_types: make most arches use generic header file	2009-06-16 19:47:51 -07:00
frv	mm: consolidate init_mm definition	2009-06-16 19:47:28 -07:00
h8300	ptrace: remove PT_DTRACE from arch/h8300	2009-06-18 13:03:48 -07:00
ia64	dma-mapping: ia64: add CONFIG_DMA_API_DEBUG support	2009-06-18 13:03:58 -07:00
m32r	ptrace: remove PT_DTRACE from arch/m32r	2009-06-18 13:03:49 -07:00
m68k	ptrace: remove PT_DTRACE from m68k, m68knommu	2009-06-18 13:03:48 -07:00
m68knommu	ptrace: remove PT_DTRACE from m68k, m68knommu	2009-06-18 13:03:48 -07:00
microblaze	kmap_types: make most arches use generic header file	2009-06-16 19:47:51 -07:00
mips	Delete pcibios_select_root	2009-06-17 14:04:42 -07:00
mn10300	MN10300: Add support for new ELF relocs in kernel modules	2009-06-18 13:10:33 -07:00
parisc	ptrace: remove PT_DTRACE from avr32, mn10300, parisc, s390, sh, xtensa	2009-06-18 13:03:48 -07:00
powerpc	Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc	2009-06-19 17:40:40 -07:00
s390	ptrace: remove PT_DTRACE from avr32, mn10300, parisc, s390, sh, xtensa	2009-06-18 13:03:48 -07:00
sh	Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6	2009-06-18 14:07:35 -07:00
sparc	Delete pcibios_select_root	2009-06-17 14:04:42 -07:00
um	Merge branch 'akpm'	2009-06-16 19:50:13 -07:00
x86	dma-mapping: x86: use asm-generic/dma-mapping-common.h	2009-06-18 13:03:58 -07:00
xtensa	ptrace: remove PT_DTRACE from avr32, mn10300, parisc, s390, sh, xtensa	2009-06-18 13:03:48 -07:00
.gitignore
Kconfig	gcov: add gcov profiling infrastructure	2009-06-18 13:03:57 -07:00