Linus Torvalds da457d4b93 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: (27 commits) [POWERPC] 83xx: Update mpc8349emitx(gp) defconfig for USB [POWERPC] 83xx: Update mpc832x_rdb_defconfig to enable MMC-over-SPI [POWERPC] 83xx: MPC832x RDB - remove spidev stub, use mmc_spi [POWERPC] 8xxx: MDS board RTC fixes [POWERPC] Fix 8xx build breakage due to _tlbie changes [POWERPC] Fix device tree interrupt map for Freescale ULI1575 boards [POWERPC] Fix possible division by zero in scaled time accounting [POWERPC] spufs: Fix context destroy vs /spu readdir race [POWERPC] Fix RTAS os-term usage on kernel panic [POWERPC] 83xx: Handle mpc8360 rev. 2.1 RGMII timing erratum [POWERPC] Document rgmii-rxid and rgmii-txid phy-connection-types [POWERPC] 83xx: Fix 2nd UCC entry in mpc832x_mds.dts [POWERPC] 83xx: mpc832x mds: Fix board PHY reset code [POWERPC] Fix potential NULL dereference [POWERPC] vdso: Fixes for cache block sizes [POWERPC] pasemi: Don't reset mpic at boot [POWERPC] Fix kmalloc alignment on non-coherent DMA platforms [POWERPC] Fix build failure on legacy iSeries [POWERPC] 4xx: Use virtual PVR value to init FPU on arch/ppc 440EP [POWERPC] 4xx: UIC add mask_ack callback ...		2007-11-26 19:08:35 -08:00
..
acpi	ACPI: Fan: Drop force_power_state acpi_device option	2007-10-25 16:31:31 -04:00
asm-alpha	Add CONFIG_DEBUG_SG sg validation	2007-10-22 21:20:03 +02:00
asm-arm	[ARM] 4644/2: fix flush_kern_tlb_range() in module space	2007-11-08 10:07:14 +00:00
asm-avr32	[AVR32] Add missing bit in PCCR sysreg	2007-11-15 13:47:20 +01:00
asm-blackfin	Blackfin arch: use a less common define name in BF549	2007-10-30 12:04:53 +08:00
asm-cris	CRIS tlb.h should include linux/pagemap.h	2007-11-14 18:45:47 -08:00
asm-frv	frv: Remove bogus NO_IRQ = -1 define	2007-11-09 15:11:44 -08:00
asm-generic
asm-h8300	Add CONFIG_DEBUG_SG sg validation	2007-10-22 21:20:03 +02:00
asm-ia64	[IA64] Update printing of feature set bits	2007-11-09 13:05:30 -08:00
asm-m32r	Add CONFIG_DEBUG_SG sg validation	2007-10-22 21:20:03 +02:00
asm-m68k	Add CONFIG_DEBUG_SG sg validation	2007-10-22 21:20:03 +02:00
asm-m68knommu	m68knommu: fix pread/pwrite defines	2007-11-05 15:12:33 -08:00
asm-mips	[MIPS] 64-bit Sibyte kernels need DMA32.	2007-11-26 17:26:14 +00:00
asm-parisc	parisc: fix sg_page() fallout	2007-10-23 09:49:31 +02:00
asm-powerpc	[POWERPC] Fix RTAS os-term usage on kernel panic	2007-11-20 16:10:09 +11:00
asm-ppc	ppc: fix AT_VECTOR_SIZE on arch/ppc	2007-10-22 19:18:54 -07:00
asm-s390	Merge branch 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6	2007-10-22 19:23:34 -07:00
asm-sh	sh: remove dead config symbols from SH code	2007-11-09 04:45:29 +09:00
asm-sh64	sh: remove PTRACE_O_TRACESYSGOOD from asm/ptrace.h	2007-11-07 11:13:54 +09:00
asm-sparc	[SPARC32]: __inline__ --> inline	2007-10-27 00:17:01 -07:00
asm-sparc64	[SPARC64]: Use "is_power_of_2" macro for simplicity.	2007-11-07 02:24:33 -08:00
asm-um	uml: update address space affected by pud_clear	2007-11-14 18:45:37 -08:00
asm-v850	Add CONFIG_DEBUG_SG sg validation	2007-10-22 21:20:03 +02:00
asm-x86	x86: fix reboot with no keyboard attached	2007-11-17 16:27:01 +01:00
asm-xtensa	xtensa: dma-mapping.h is using linux/scatterlist.h functions, so include it	2007-10-24 13:28:40 +02:00
crypto
keys
linux	SELinux: return EOPNOTSUPP not ENOTSUPP	2007-11-17 10:38:16 +11:00
math-emu
media	[PATCH] Fix breakage after SG cleanups	2007-10-23 12:02:39 -07:00
mtd
net	[INET]: Fix potential kfree on vmalloc-ed area of request_sock_queue	2007-11-15 02:57:06 -08:00
pcmcia	[AVR32] pcmcia ioaddr_t should be 32 bits on AVR32	2007-11-15 13:47:19 +01:00
rdma	cleanup asm/scatterlist.h includes	2007-11-02 08:47:06 +01:00
rxrpc
scsi	SCSI: add asynchronous event notification API	2007-11-03 22:23:02 -04:00
sound	[ALSA] version 1.0.15	2007-11-20 20:16:43 +01:00
video	Make asm-x86/bootparam.h includable from userspace.	2007-10-23 15:49:47 +10:00
xen
Kbuild