tmp_suning_uos_patched/arch/arm
Russell King 5a89770daa Merge branches 'pxa-core' and 'pxa-machines' into pxa-all
Conflicts:

	arch/arm/mach-pxa/Kconfig
	arch/arm/mach-pxa/pxa25x.c
	arch/arm/mach-pxa/pxa27x.c
2008-10-07 19:08:56 +01:00
..
boot [ARM] 5194/1: update .gitignore 2008-08-12 19:54:09 +01:00
common [ARM] 4733/1: export sharpsl_param 2008-10-03 10:18:35 +01:00
configs Merge branch 'viper-for-rmk' of git://www.misterjones.org/linux-2.6-arm 2008-10-07 19:08:32 +01:00
include/asm Merge branches 'pxa-core' and 'pxa-machines' into pxa-all 2008-10-07 19:08:56 +01:00
kernel Merge master.kernel.org:/home/rmk/linux-2.6-arm 2008-08-16 16:48:45 -07:00
lib [ARM] 5226/1: remove unmatched comment end. 2008-08-28 17:12:29 +01:00
mach-aaec2000
mach-at91
mach-clps711x
mach-clps7500
mach-davinci
mach-ebsa110
mach-ep93xx
mach-footbridge [ARM] use bcd2bin/bin2bcd 2008-08-27 20:07:59 +01:00
mach-h720x
mach-imx
mach-integrator [ARM] fix impd1.c build warning 2008-08-18 13:52:07 +01:00
mach-iop13xx
mach-iop32x
mach-iop33x
mach-ixp4xx [ARM] 5208/1: fsg-setup.c fixes 2008-08-19 16:56:42 +01:00
mach-ixp23xx
mach-ixp2000
mach-kirkwood
mach-ks8695
mach-l7200
mach-lh7a40x [ARM] 5191/1: ARM: remove CVS keywords 2008-08-16 20:01:18 +01:00
mach-loki
mach-msm
mach-mv78xx0
mach-mx2
mach-mx3
mach-netx
mach-ns9xxx
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 [ARM] Orion: register UART1 on QNAP TS-209 and TS-409 2008-08-21 22:15:17 -04:00
mach-pnx4008
mach-pxa Merge branches 'pxa-core' and 'pxa-machines' into pxa-all 2008-10-07 19:08:56 +01:00
mach-realview
mach-rpc
mach-s3c2400
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
mach-s3c2442
mach-s3c2443
mach-sa1100 [ARM] 5191/1: ARM: remove CVS keywords 2008-08-16 20:01:18 +01:00
mach-shark
mach-versatile
mm [ARM] 5241/1: provide ioremap_wc() 2008-09-06 13:13:44 +01:00
nwfpe
oprofile
plat-iop
plat-mxc [ARM] remove unused #include <version.h> 2008-09-04 10:47:14 +01:00
plat-omap [ARM] omap: fix virtual vs physical address space confusions 2008-09-04 22:21:19 +01:00
plat-orion
plat-s3c
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
Kconfig Merge branch 'pxa-trizeps' into pxa-machines 2008-10-07 19:06:52 +01:00
Kconfig-nommu
Kconfig.debug
Makefile