David S. Miller b262e60309 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 ... Conflicts: drivers/net/wireless/ath9k/core.c drivers/net/wireless/ath9k/main.c net/core/dev.c		2008-10-01 06:12:56 -07:00
..
boot	[ARM] 5194/1: update .gitignore	2008-08-12 19:54:09 +01:00
common	[ARM] dma-mapping: provide sync_range APIs	2008-08-10 14:05:14 +01:00
configs	Merge branch 'omap-rmk'	2008-08-27 23:07:46 +01:00
include/asm	ARM: Delete ARM's own cnt32_to_63.h	2008-09-26 08:49:04 -07:00
kernel	kgdb, x86, arm, mips, powerpc: ignore user space single stepping	2008-09-26 10:36:41 -05:00
lib	[ARM] 5226/1: remove unmatched comment end.	2008-08-28 17:12:29 +01:00
mach-aaec2000	[ARM] Move include/asm-arm/arch-* to arch/arm/*/include/mach	2008-08-07 09:55:48 +01:00
mach-at91	[ARM] Move include/asm-arm/arch-* to arch/arm/*/include/mach	2008-08-07 09:55:48 +01:00
mach-clps711x	[ARM] Move include/asm-arm/arch-* to arch/arm/*/include/mach	2008-08-07 09:55:48 +01:00
mach-clps7500	[ARM] Move include/asm-arm/arch-* to arch/arm/*/include/mach	2008-08-07 09:55:48 +01:00
mach-davinci	[ARM] 5249/1: davinci: remove redundant check in davinci_psc_config()	2008-09-17 20:57:04 +01:00
mach-ebsa110	[ARM] Move include/asm-arm/arch-* to arch/arm/*/include/mach	2008-08-07 09:55:48 +01:00
mach-ep93xx	[ARM] Move include/asm-arm/arch-* to arch/arm/*/include/mach	2008-08-07 09:55:48 +01:00
mach-footbridge	[ARM] use bcd2bin/bin2bcd	2008-08-27 20:07:59 +01:00
mach-h720x	[ARM] Move include/asm-arm/arch-* to arch/arm/*/include/mach	2008-08-07 09:55:48 +01:00
mach-imx	[ARM] Move include/asm-arm/arch-* to arch/arm/*/include/mach	2008-08-07 09:55:48 +01:00
mach-integrator	[ARM] fix impd1.c build warning	2008-08-18 13:52:07 +01:00
mach-iop13xx	[ARM] Move include/asm-arm/arch-* to arch/arm/*/include/mach	2008-08-07 09:55:48 +01:00
mach-iop32x	[ARM] Move include/asm-arm/arch-* to arch/arm/*/include/mach	2008-08-07 09:55:48 +01:00
mach-iop33x	[ARM] Move include/asm-arm/arch-* to arch/arm/*/include/mach	2008-08-07 09:55:48 +01:00
mach-ixp4xx	[ARM] 5208/1: fsg-setup.c fixes	2008-08-19 16:56:42 +01:00
mach-ixp23xx	[ARM] Move include/asm-arm/arch-* to arch/arm/*/include/mach	2008-08-07 09:55:48 +01:00
mach-ixp2000	[ARM] Move include/asm-arm/arch-* to arch/arm/*/include/mach	2008-08-07 09:55:48 +01:00
mach-kirkwood	mv643xx_eth: remove force_phy_addr field	2008-09-05 06:33:59 +02:00
mach-ks8695	[ARM] Move include/asm-arm/arch-* to arch/arm/*/include/mach	2008-08-07 09:55:48 +01:00
mach-l7200	[ARM] Move include/asm-arm/arch-* to arch/arm/*/include/mach	2008-08-07 09:55:48 +01:00
mach-lh7a40x	[ARM] 5191/1: ARM: remove CVS keywords	2008-08-16 20:01:18 +01:00
mach-loki	mv643xx_eth: remove force_phy_addr field	2008-09-05 06:33:59 +02:00
mach-msm	[ARM] Move include/asm-arm/arch-* to arch/arm/*/include/mach	2008-08-07 09:55:48 +01:00
mach-mv78xx0	mv643xx_eth: remove force_phy_addr field	2008-09-05 06:33:59 +02:00
mach-mx2	[ARM] Move include/asm-arm/arch-* to arch/arm/*/include/mach	2008-08-07 09:55:48 +01:00
mach-mx3	pcm037: add rts/cts support for serial port	2008-09-02 10:19:29 +02:00
mach-netx	[ARM] Move include/asm-arm/arch-* to arch/arm/*/include/mach	2008-08-07 09:55:48 +01:00
mach-ns9xxx	[ARM] Move include/asm-arm/arch-* to arch/arm/*/include/mach	2008-08-07 09:55:48 +01:00
mach-omap1	[ARM] omap: fix virtual vs physical address space confusions	2008-09-04 22:21:19 +01:00
mach-omap2	[ARM] omap: fix virtual vs physical address space confusions	2008-09-04 22:21:19 +01:00
mach-orion5x	mv643xx_eth: remove force_phy_addr field	2008-09-05 06:33:59 +02:00
mach-pnx4008	[ARM] fix pnx4008 build errors	2008-08-08 15:13:27 +01:00
mach-pxa	MN10300: Move asm-arm/cnt32_to_63.h to include/linux/	2008-09-24 16:38:17 -07:00
mach-realview	[ARM] Move include/asm-arm/arch-* to arch/arm/*/include/mach	2008-08-07 09:55:48 +01:00
mach-rpc	[ARM] Move include/asm-arm/arch-* to arch/arm/*/include/mach	2008-08-07 09:55:48 +01:00
mach-s3c2400	[ARM] Move include/asm-arm/arch-* to arch/arm/*/include/mach	2008-08-07 09:55:48 +01:00
mach-s3c2410	[ARM] S3C2443: Fix the S3C2443 clock register definitions	2008-08-26 22:56:22 +01:00
mach-s3c2412	[ARM] JIVE: Fix the spi bus numbering	2008-08-26 22:56:22 +01:00
mach-s3c2440	Merge http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm into for-rmk	2008-08-08 21:10:12 +01:00
mach-s3c2442	[ARM] Move include/asm-arm/arch-* to arch/arm/*/include/mach	2008-08-07 09:55:48 +01:00
mach-s3c2443	[ARM] Move include/asm-arm/arch-* to arch/arm/*/include/mach	2008-08-07 09:55:48 +01:00
mach-sa1100	MN10300: Move asm-arm/cnt32_to_63.h to include/linux/	2008-09-24 16:38:17 -07:00
mach-shark	[ARM] Move include/asm-arm/arch-* to arch/arm/*/include/mach	2008-08-07 09:55:48 +01:00
mach-versatile	MN10300: Move asm-arm/cnt32_to_63.h to include/linux/	2008-09-24 16:38:17 -07:00
mm	[ARM] 5241/1: provide ioremap_wc()	2008-09-06 13:13:44 +01:00
nwfpe	[ARM] move include/asm-arm to arch/arm/include/asm	2008-08-02 21:32:35 +01:00
oprofile	[ARM] Move include/asm-arm/arch-* to arch/arm/*/include/mach	2008-08-07 09:55:48 +01:00
plat-iop	[ARM] Move include/asm-arm/arch-* to arch/arm/*/include/mach	2008-08-07 09:55:48 +01:00
plat-mxc	[ARM] remove unused #include <version.h>	2008-09-04 10:47:14 +01:00
plat-omap	[ARM] omap: back out 'internal_clock' support	2008-09-17 21:01:55 +01:00
plat-orion	[ARM] Move include/asm-arm/plat-orion to arch/arm/plat-orion/include/plat	2008-08-09 13:44:58 +02:00
plat-s3c	[ARM] 4518/1: S3C: Rename watchdog configuration options	2007-07-22 16:44:38 +01:00
plat-s3c24xx	[ARM] S3C24XX: pwm.c: stop debugging output	2008-08-26 22:56:21 +01:00
tools	[ARM] update mach-types	2008-08-16 09:30:05 +01:00
vfp	smp_call_function: get rid of the unused nonatomic/retry argument	2008-06-26 11:24:35 +02:00
Kconfig	[ARM] Skip memory holes in FLATMEM when reading /proc/pagetypeinfo	2008-08-27 20:09:28 +01: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	[ARM] Move include/asm-arm/arch-* to arch/arm/*/include/mach	2008-08-07 09:55:48 +01:00