Linus Torvalds 9f5577d815 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: (21 commits) [POWERPC] spusched: Fix initial timeslice calculation [POWERPC] spufs: Fix incorrect initialization of cbe_spu_info.spus [POWERPC] Fix Maple platform ISA bus [POWERPC] Make pci_iounmap actually unmap things [POWERPC] Add function to check if address is an IO port [POWERPC] Fix Pegasos keyboard detection [POWERPC] iSeries: Fix section mismatch warning in lpevents [POWERPC] iSeries: Fix section mismatch warnings [POWERPC] iSeries: We need vio_enable_interrupts [POWERPC] Fix RTC and device tree on linkstation machines [POWERPC] Add of_register_i2c_devices() [POWERPC] Fix loop with unsigned long counter variable [POWERPC] Fix register labels on show_regs() message for 4xx/Book-E [POWERPC] Only allow building of BootX text support on PPC_MULTIPLATFORM [POWERPC] Fix the ability to reset on MPC8544 DS and MPC8568 MDS boards [POWERPC] Fix mpc7448hpc2 tsi108 device_type bug [POWREPC] Fixup a number of modpost warnings on ppc32 [POWERPC] Fix ethernet PHY support on MPC8544 DS [POWERPC] Don't try to allocate resources for a Freescale POWERPC PHB Revert "[POWERPC] Don't complain if size-cells == 0 in prom_parse()" ...		2007-07-26 14:00:09 -07:00
..
alpha	deal with alpha section warnings	2007-07-26 11:11:57 -07:00
arm	[BLOCK] Get rid of request_queue_t typedef	2007-07-24 09:28:11 +02:00
arm26	take declarations of enable_irq() et.al. to linux/interrupt.h	2007-07-22 11:44:00 -07:00
avr32	Merge branch 'for-linus' of git://git.o-hand.com/linux-rpurdie-leds	2007-07-22 11:22:01 -07:00
blackfin	some kmalloc/memset ->kzalloc (tree wide)	2007-07-19 10:04:50 -07:00
cris	Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild	2007-07-19 14:28:19 -07:00
frv	FRV: work around a possible compiler bug	2007-07-19 10:04:50 -07:00
h8300	PTRACE_POKEDATA consolidation	2007-07-17 10:23:03 -07:00
i386	Revert most of "x86: Fix alternatives and kprobes to remap write-protected kernel text"	2007-07-26 12:07:21 -07:00
ia64	cyclone.c: silly use of volatile, __iomem fixes	2007-07-26 11:11:57 -07:00
m32r	m32r: Fix ei_tx_timeout() in drivers/net/lib8390.c	2007-07-26 11:35:20 -07:00
m68k	take declarations of enable_irq() et.al. to linux/interrupt.h	2007-07-22 11:44:00 -07:00
m68knommu	m68knommu: use setup_irq() in 68328 timer code	2007-07-26 11:05:20 -07:00
mips	[MIPS] Fix marge error due to conflict in arch/mips/kernel/head.S	2007-07-24 16:02:48 +01:00
parisc	define new percpu interface for shared data	2007-07-19 10:04:44 -07:00
powerpc	Merge branch 'fixes-2.6.23' of master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc into merge	2007-07-26 16:43:24 +10:00
ppc	[POWERPC] mv64x60: Use mutex instead of semaphore	2007-07-22 21:30:58 +10:00
s390	s390: Put allocated ELF notes in read-only data segment	2007-07-19 10:04:47 -07:00
sh	clockevents: fix resume logic	2007-07-21 17:49:15 -07:00
sh64	sh64: Flag sh64_get_page() as __init_refok.	2007-07-20 17:46:42 +09:00
sparc	[SPARC32]: Fix bug in sparc optimized memset.	2007-07-24 13:41:44 -07:00
sparc64	viohs: extern on function definition	2007-07-26 11:11:56 -07:00
um	Merge branch 'request-queue-t' of git://git.kernel.dk/linux-2.6-block	2007-07-24 12:26:44 -07:00
v850	PTRACE_POKEDATA consolidation	2007-07-17 10:23:03 -07:00
x86_64	Revert most of "x86: Fix alternatives and kprobes to remap write-protected kernel text"	2007-07-26 12:07:21 -07:00
xtensa	Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild	2007-07-19 14:28:19 -07:00