Linus Torvalds c4888f9ffa 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: (37 commits) [POWERPC] EEH: Make sure warning message is printed [POWERPC] Make altivec code in swsusp_32.S depend on CONFIG_ALTIVEC [POWERPC] windfarm: Fix windfarm thread freezer interaction [POWERPC] Fix si_addr value on low level hash failures [POWERPC] Refresh ppc64_defconfig and enable pasemi-related options [POWERPC] pasemi: Update defconfig [POWERPC] iSeries: Fix ref counting in vio setup [POWERPC] ] Fix memset size error [POWERPC] Fix link errors for allyesconfig [POWERPC] iSeries_init_IRQ non-PCI tidy [POWERPC] Change fallocate to match unistd.h on powerpc [POWERPC] EEH: Avoid crash on null device [POWERPC] EEH: Drivers that need reset trump others [POWERPC] EEH: Clean up comments [POWERPC] Fix off-by-one error in setting decrementer on Book E/4xx (v2) [POWERPC] Fix switch_slb handling of 1T ESID values [POWERPC] Fix build failure when CONFIG_VIRT_CPU_ACCOUNTING is not defined [POWERPC] Include udbg.h when using udbg_printf [POWERPC] Fix cache line vs. block size confusion [POWERPC] Fix sysctl table check failure on PowerMac ...		2007-11-09 15:16:52 -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] 4634/1: DaVinci GPIO header build fix	2007-10-31 15:21:52 +00:00
asm-avr32	AVR32: Fix sg_page breakage	2007-10-24 10:16:02 +02:00
asm-blackfin	Blackfin arch: use a less common define name in BF549	2007-10-30 12:04:53 +08:00
asm-cris	Add CONFIG_DEBUG_SG sg validation	2007-10-22 21:20:03 +02:00
asm-frv	frv: Remove bogus NO_IRQ = -1 define	2007-11-09 15:11:44 -08:00
asm-generic	Linux Kernel Markers	2007-10-19 11:53:54 -07:00
asm-h8300	Add CONFIG_DEBUG_SG sg validation	2007-10-22 21:20:03 +02:00
asm-ia64	[IA64] fix typo in per_cpu_offset	2007-10-29 11:21:45 -07: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	Use i8253.c lock for PC speaker on MIPS, too.	2007-11-02 19:39:18 -07:00
asm-parisc	parisc: fix sg_page() fallout	2007-10-23 09:49:31 +02:00
asm-powerpc	Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc	2007-11-09 15:16:52 -08: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: Decouple 4k and soft/hardirq stacks.	2007-11-02 12:16:51 +09:00
asm-sh64	sh64: fix dma_cache_sync() compilation	2007-10-30 13:09:01 +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	x86 merge fallout: uml	2007-10-29 07:41:32 -07:00
asm-v850	Add CONFIG_DEBUG_SG sg validation	2007-10-22 21:20:03 +02:00
asm-x86	lguest: make async_hcall() static	2007-11-05 21:53:29 +11: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	[NETLINK]: Fix unicast timeouts	2007-11-07 04:15:12 -08:00
math-emu
media	[PATCH] Fix breakage after SG cleanups	2007-10-23 12:02:39 -07:00
mtd
net	[INET]: Remove per bucket rwlock in tcp/dccp ehash table.	2007-11-07 04:15:11 -08:00
pcmcia
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-10-23 08:09:20 +02:00
video	Make asm-x86/bootparam.h includable from userspace.	2007-10-23 15:49:47 +10:00
xen
Kbuild