Linus Torvalds e9b62693ae Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/juhl/trivial ... * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/juhl/trivial: (24 commits) DOC: A couple corrections and clarifications in USB doc. Generate a slightly more informative error msg for bad HZ fix typo "is" -> "if" in Makefile ext*: spelling fix prefered -> preferred DOCUMENTATION: Use newer DEFINE_SPINLOCK macro in docs. KEYS: Fix the comment to match the file name in rxrpc-type.h. RAID: remove trailing space from printk line DMA engine: typo fixes Remove unused MAX_NODES_SHIFT MAINTAINERS: Clarify access to OCFS2 development mailing list. V4L: Storage class should be before const qualifier (sn9c102) V4L: Storage class should be before const qualifier sonypi: Storage class should be before const qualifier intel_menlow: Storage class should be before const qualifier DVB: Storage class should be before const qualifier arm: Storage class should be before const qualifier ALSA: Storage class should be before const qualifier acpi: Storage class should be before const qualifier firmware_sample_driver.c: fix coding style MAINTAINERS: Add ati_remote2 driver ... Fixed up trivial conflicts in firmware_sample_driver.c		2008-04-21 16:36:46 -07:00
..
boot	[ARM] 4854/1: fix the load address of uImage for CONFIG_ZBOOT_ROM=y	2008-04-19 11:28:07 +01:00
common	Merge branch 'semaphore' of git://git.kernel.org/pub/scm/linux/kernel/git/willy/misc	2008-04-21 15:41:27 -07:00
configs	Merge branches 'arm', 'at91', 'ep93xx', 'iop', 'ks8695', 'misc', 'mxc', 'ns9x', 'orion', 'pxa', 'sa1100', 's3c' and 'sparsemem' into devel	2008-04-19 17:17:25 +01:00
kernel	Merge branch 'merge-fixes' into devel	2008-04-19 17:17:34 +01:00
lib	[ARM] spelling fixes	2007-05-20 20:10:32 +01:00
mach-aaec2000	arch: Remove unnecessary inclusions of asm/semaphore.h	2008-04-18 22:14:49 -04:00
mach-at91	Merge branch 'semaphore' of git://git.kernel.org/pub/scm/linux/kernel/git/willy/misc	2008-04-21 15:41:27 -07:00
mach-clps711x	[ARM] Add initial sparsemem support	2008-04-19 11:36:48 +01:00
mach-clps7500	[ARM] Fix timer damage from d3d74453c3	2008-01-28 10:17:12 +00:00
mach-davinci	[ARM] constify function pointer tables	2008-02-09 22:46:44 +00:00
mach-ebsa110	[ARM] Fix timer damage from d3d74453c3	2008-01-28 10:17:12 +00:00
mach-ep93xx	[ARM] 4988/1: Add GPIO lib support to the EP93xx	2008-04-19 14:01:43 +01:00
mach-footbridge	[ARM] Fix timer damage from d3d74453c3	2008-01-28 10:17:12 +00:00
mach-h720x	[ARM] replace remaining __FUNCTION__ occurrences	2008-03-06 12:18:18 +00:00
mach-imx	[ARM] replace remaining __FUNCTION__ occurrences	2008-03-06 12:18:18 +00:00
mach-integrator	Merge branch 'irq-cleanups-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/misc-2.6	2008-04-21 15:56:19 -07:00
mach-iop13xx	[ARM] replace remaining __FUNCTION__ occurrences	2008-03-06 12:18:18 +00:00
mach-iop32x	iop: unconditionally initialize the ATU on platforms known to be 'hosts'	2008-03-26 12:33:41 -07:00
mach-iop33x	iop: unconditionally initialize the ATU on platforms known to be 'hosts'	2008-03-26 12:33:41 -07:00
mach-ixp4xx	[ARM] replace remaining __FUNCTION__ occurrences	2008-03-06 12:18:18 +00:00
mach-ixp23xx	[ARM] remove duplicate includes	2008-01-26 14:50:07 +00:00
mach-ixp2000	[ARM] Fix timer damage from d3d74453c3	2008-01-28 10:17:12 +00:00
mach-ks8695	[ARM] 4981/1: [KS8695] Simple LED driver	2008-04-17 15:58:25 +01:00
mach-l7200	[ARM] Remove compatibility layer for ARM irqs	2006-11-30 12:24:47 +00:00
mach-lh7a40x	[ARM] Fix timer damage from d3d74453c3	2008-01-28 10:17:12 +00:00
mach-msm	[ARM] msm: dma support for MSM7X00A	2008-01-26 14:39:14 +00:00
mach-mx3	[ARM] Fix timer damage from d3d74453c3	2008-01-28 10:17:12 +00:00
mach-netx	[ARM] replace remaining __FUNCTION__ occurrences	2008-03-06 12:18:18 +00:00
mach-ns9xxx	ns9xxx: add clock api	2008-03-31 10:33:25 +02:00
mach-omap1	ARM: OMAP2: Clean-up mux code	2008-04-14 09:57:13 -07:00
mach-omap2	ARM: OMAP2: New DPLL clock framework	2008-04-14 10:29:39 -07:00
mach-orion5x	[ARM] 4955/1: Orion: Support the Buffalo Linkstation Pro/Live Platform	2008-04-10 15:27:11 +01:00
mach-pnx4008	arch: Remove unnecessary inclusions of asm/semaphore.h	2008-04-18 22:14:49 -04:00
mach-pxa	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/juhl/trivial	2008-04-21 16:36:46 -07:00
mach-realview	Merge branch 'semaphore' of git://git.kernel.org/pub/scm/linux/kernel/git/willy/misc	2008-04-21 15:41:27 -07:00
mach-rpc	Rename: linux/pata_platform.h to linux/ata_platform.h	2008-02-06 06:54:17 -05:00
mach-s3c2400	[ARM] 4157/2: S3C24XX: move arch/arch/mach-s3c2410 into cpu components	2007-02-11 17:36:09 +00:00
mach-s3c2410	[ARM] 5005/1: BAST: Fix kset_name initialiser	2008-04-19 14:04:36 +01:00
mach-s3c2412	[ARM] 4985/1: S3C2412: Fix ARMDIVN name in CLKDIVN definition.	2008-04-17 17:04:38 +01:00
mach-s3c2440	[ARM] 4986/1: S3C24XX: Simtec machines need UCLK as parent to DCLK	2008-04-17 17:04:40 +01:00
mach-s3c2442	[ARM] 4794/1: S3C24XX: Comonise S3C2440 and S3C2442 clock code	2008-01-28 13:20:52 +00:00
mach-s3c2443	Driver core: change sysdev classes to use dynamic kobject names	2008-01-24 20:40:40 -08:00
mach-sa1100	[ARM] sa1100: add clock event support	2008-04-14 23:03:10 +01:00
mach-shark	[ARM] Fix timer damage from d3d74453c3	2008-01-28 10:17:12 +00:00
mach-versatile	arch: Remove unnecessary inclusions of asm/semaphore.h	2008-04-18 22:14:49 -04:00
mm	Merge branches 'arm', 'at91', 'ep93xx', 'iop', 'ks8695', 'misc', 'mxc', 'ns9x', 'orion', 'pxa', 'sa1100', 's3c' and 'sparsemem' into devel	2008-04-19 17:17:25 +01:00
nwfpe	Convert files to UTF-8 and some cleanups	2007-10-19 23:21:04 +02:00
oprofile	Driver core: change sysdev classes to use dynamic kobject names	2008-01-24 20:40:40 -08:00
plat-iop	iop: unconditionally initialize the ATU on platforms known to be 'hosts'	2008-03-26 12:33:41 -07:00
plat-mxc	[ARM] 4887/1: i.MXC family: Separate current platform code	2008-04-17 16:15:17 +01:00
plat-omap	Merge branch 'semaphore' of git://git.kernel.org/pub/scm/linux/kernel/git/willy/misc	2008-04-21 15:41:27 -07:00
plat-orion	[ARM] 4954/1: Orion: fix some function section mismatch	2008-04-10 15:27:09 +01:00
plat-s3c	[ARM] 4518/1: S3C: Rename watchdog configuration options	2007-07-22 16:44:38 +01:00
plat-s3c24xx	[ARM] 4967/1: Adds functions to set clkout rate for Samsung S3C2410	2008-04-19 14:04:30 +01:00
tools	[ARM] Update mach-types	2008-04-19 11:28:05 +01:00
vfp	[ARM] 4583/1: ARMv7: Add VFPv3 support	2008-01-26 14:41:28 +00:00
Kconfig	Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-2.6	2008-04-21 15:49:58 -07:00
Kconfig-nommu	[ARM] 4532/1: allow configuration of processor ID	2007-10-12 23:43:02 +01:00
Kconfig.debug	[ARM] CONFIG_DEBUG_STACK_USAGE	2008-01-26 14:50:06 +00:00
Makefile	Merge branches 'arm', 'at91', 'ep93xx', 'iop', 'ks8695', 'misc', 'mxc', 'ns9x', 'orion', 'pxa', 'sa1100', 's3c' and 'sparsemem' into devel	2008-04-19 17:17:25 +01:00