Linus Torvalds 45158894d4 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: (249 commits) powerpc: Fix pte_update for CONFIG_PTE_64BIT and !PTE_ATOMIC_UPDATES powerpc: Fix a build problem on ppc32 with new DMA_ATTRs ibm_newemac: Add MII mode support to the EMAC RGMII bridge. powerpc: Don't spin on sync instruction at boot time powerpc: Add VSX load/store alignment exception handler powerpc: fix giveup_vsx to save registers correctly powerpc: support for latencytop powerpc: Remove unnecessary condition when sanity-checking WIMG bits powerpc: Add PPC_FEATURE_PSERIES_PERFMON_COMPAT powerpc: Add driver for Barrier Synchronization Register powerpc: mman.h export fixups powerpc/fsl: update crypto node definition and device tree instances powerpc/fsl: Refactor device bindings powerpc/85xx: Minor fixes for 85xxds and 8536ds board. powerpc: Add 82xx/83xx/86xx to 6xx Multiplatform powerpc/85xx: publish of device for cds platforms powerpc/booke: don't reinitialize time base powerpc/86xx: Refactor pic init powerpc/CPM: Add i2c pins to dts and board setup cpm_uart: Support uart_wait_until_sent() ...		2008-07-15 19:04:58 -07:00
..
acpi	proper prototype for acpi_processor_tstate_has_changed()	2008-06-11 19:13:46 -04:00
asm-alpha	smp_call_function: get rid of the unused nonatomic/retry argument	2008-06-26 11:24:35 +02:00
asm-arm	Merge branch 'generic-ipi' into generic-ipi-for-linus	2008-07-15 21:55:59 +02:00
asm-avr32	Merge git://git.kernel.org/pub/scm/linux/kernel/git/hskinnemoen/avr32-2.6	2008-07-14 13:37:29 -07:00
asm-blackfin	Blackfin Serial Driver: Use timer to poll CTS PIN instead of workqueue.	2008-06-19 17:46:39 +08:00
asm-cris
asm-frv	frv: fix irqs_disabled() to return an int, not an unsigned long	2008-07-12 14:33:42 -07:00
asm-generic	mm: fix build on non-mmu machines	2008-07-15 13:58:40 -07:00
asm-h8300	h8300: fix typo in header guard	2008-06-06 11:29:12 -07:00
asm-ia64	ia64: convert to generic helpers for IPI function calls	2008-06-26 11:22:30 +02:00
asm-m32r	m32r: convert to generic helpers for IPI function calls	2008-06-26 11:22:57 +02:00
asm-m68k	m68k: Add ext2_find_{first,next}_bit() for ext4	2008-06-12 18:05:39 -07:00
asm-m68knommu
asm-mips	Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus	2008-07-15 15:01:29 -07:00
asm-mn10300	MN10300: Fix typo in header guard	2008-05-28 07:59:06 -07:00
asm-parisc	parisc: convert to generic helpers for IPI function calls	2008-06-26 11:22:57 +02:00
asm-powerpc	Merge commit 'origin/master'	2008-07-16 11:07:59 +10:00
asm-s390	[S390] Remove P390 support.	2008-07-14 10:02:25 +02:00
asm-sh	sh: convert to generic helpers for IPI function calls	2008-06-26 11:22:58 +02:00
asm-sparc	smp_call_function: get rid of the unused nonatomic/retry argument	2008-06-26 11:24:35 +02:00
asm-sparc64	fix "ftrace: store mcount address in rec->ip"	2008-07-01 17:46:14 +02:00
asm-um	uml: activate_mm: remove the dead PF_BORROWED_MM check	2008-06-06 11:36:22 -07:00
asm-v850	v850: fix typo in header guard	2008-06-06 11:29:12 -07:00
asm-x86	Merge branch 'generic-ipi' into generic-ipi-for-linus	2008-07-15 21:55:59 +02:00
asm-xtensa
crypto	crypto: hash - Move ahash functions into crypto/hash.h	2008-07-10 20:35:18 +08:00
drm	drm/radeon: fixup issue with radeon and PAT support.	2008-07-15 15:48:05 +10:00
keys
linux	Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc	2008-07-15 19:04:58 -07:00
math-emu
media	V4L/DVB (8092): videodev: simplify and fix standard enumeration	2008-06-26 15:58:57 -03:00
mtd
net	net-sched: change tcf_destroy_chain() to clear start of filter list	2008-07-01 19:52:38 -07:00
pcmcia	pcmcia: (re)move {pcmcia,pccard}_get_status	2008-06-24 15:33:44 +02:00
rdma	RDMA/addr: Keep pointer to netdevice in struct rdma_dev_addr	2008-07-14 23:48:53 -07:00
rxrpc
scsi	Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6	2008-07-15 18:58:04 -07:00
sound	ALSA: Release v1.0.17	2008-07-14 09:54:43 +02:00
video
xen	xen: implement ptep_modify_prot_start/commit	2008-06-25 15:17:23 +02:00
Kbuild	drm: reorganise drm tree to be more future proof.	2008-07-14 10:45:01 +10:00