iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
linux/arch/arm
History
Russell King 4073723acb Merge branch 'misc' into devel 
Conflicts:
	arch/arm/Kconfig
	arch/arm/common/Makefile
	arch/arm/kernel/Makefile
	arch/arm/kernel/smp.c
2011-01-06 22:32:52 +00:00
..
boot
Merge branches 'ftrace', 'gic', 'io', 'kexec', 'mod', 'sa11x0', 'sh' and 'versatile' into devel
2011-01-05 18:08:10 +00:00
common
Merge branch 'misc' into devel
2011-01-06 22:32:52 +00:00
configs
at91: merge all at91rm9200 defconfig in one single file
2010-11-30 10:59:15 +01:00
include/asm
Merge branch 'misc' into devel
2011-01-06 22:32:52 +00:00
kernel
Merge branch 'misc' into devel
2011-01-06 22:32:52 +00:00
lib
Merge branch 'smp' into misc
2011-01-06 22:32:03 +00:00
mach-aaec2000
ARM: 6484/1: fix compile warning in mm/init.c
2010-11-21 22:05:56 +00:00
mach-at91
Merge branch 'clksrc' into devel
2011-01-05 18:09:03 +00:00
mach-bcmring
Merge branch 'misc' into devel
2011-01-06 22:32:52 +00:00
mach-clps711x
ARM: 6484/1: fix compile warning in mm/init.c
2010-11-21 22:05:56 +00:00
mach-cns3xxx
Merge branch 'misc' into devel
2011-01-06 22:32:52 +00:00
mach-davinci
Merge branch 'misc' into devel
2011-01-06 22:32:52 +00:00
mach-dove
arm: remove machine_desc.io_pg_offst and .phys_io
2010-10-20 00:27:46 -04:00
mach-ebsa110
ARM: 6484/1: fix compile warning in mm/init.c
2010-11-21 22:05:56 +00:00
mach-ep93xx
Merge branch 'smp' into misc
2011-01-06 22:32:03 +00:00
mach-footbridge
ARM: 6484/1: fix compile warning in mm/init.c
2010-11-21 22:05:56 +00:00
mach-gemini
arm: remove machine_desc.io_pg_offst and .phys_io
2010-10-20 00:27:46 -04:00
mach-h720x
ARM: 6484/1: fix compile warning in mm/init.c
2010-11-21 22:05:56 +00:00
mach-imx
Merge branch 'smp' into misc
2011-01-06 22:32:03 +00:00
mach-integrator
Merge branch 'misc' into devel
2011-01-06 22:32:52 +00:00
mach-iop13xx
Merge branch 'misc' into devel
2011-01-06 22:32:52 +00:00
mach-iop32x
ARM: io: make iounmap() a simple macro
2010-12-08 13:57:04 +00:00
mach-iop33x
ARM: io: make iounmap() a simple macro
2010-12-08 13:57:04 +00:00
mach-ixp4xx
Merge branch 'clksrc' into devel
2011-01-05 18:09:03 +00:00
mach-ixp23xx
ARM: io: make iounmap() a simple macro
2010-12-08 13:57:04 +00:00
mach-ixp2000
ARM: 6460/1: ixp2000: fix type of ixp2000_timer_interrupt
2010-10-27 21:40:28 +01:00
mach-kirkwood
ARM: io: make iounmap() a simple macro
2010-12-08 13:57:04 +00:00
mach-ks8695
ARM: DMA: Replace page_to_dma()/dma_to_page() with pfn_to_dma()/dma_to_pfn()
2011-01-03 11:27:43 +00:00
mach-l7200/include/mach
arm: return both physical and virtual addresses from addruart
2010-10-20 00:27:33 -04:00
mach-lh7a40x
arm: remove machine_desc.io_pg_offst and .phys_io
2010-10-20 00:27:46 -04:00
mach-loki
arm: remove machine_desc.io_pg_offst and .phys_io
2010-10-20 00:27:46 -04:00
mach-lpc32xx
Merge branch 'misc' into devel
2011-01-06 22:32:52 +00:00
mach-mmp
Merge branch 'misc' into devel
2011-01-06 22:32:52 +00:00
mach-msm
Merge branch 'misc' into devel
2011-01-06 22:32:52 +00:00
mach-mv78xx0
Merge git://git.kernel.org/pub/scm/linux/kernel/git/nico/orion
2010-11-07 16:10:56 +00:00
mach-mx3
Merge branch 'smp' into misc
2011-01-06 22:32:03 +00:00
mach-mx5
ARM: 6483/1: arm & sh: factorised duplicated clkdev.c
2010-11-26 10:51:04 +00:00
mach-mx25
Merge branch 'smp' into misc
2011-01-06 22:32:03 +00:00
mach-mxc91231
ARM: 6483/1: arm & sh: factorised duplicated clkdev.c
2010-11-26 10:51:04 +00:00
mach-netx
ARM: netx: update clock source registration
2010-12-22 22:44:33 +00:00
mach-nomadik
ARM: 6483/1: arm & sh: factorised duplicated clkdev.c
2010-11-26 10:51:04 +00:00
mach-ns9xxx
ARM: ns9xxx: update clock source registration
2010-12-22 22:44:34 +00:00
mach-nuc93x
ARM: 6483/1: arm & sh: factorised duplicated clkdev.c
2010-11-26 10:51:04 +00:00
mach-omap1
Merge branch 'misc' into devel
2011-01-06 22:32:52 +00:00
mach-omap2
Merge branch 'misc' into devel
2011-01-06 22:32:52 +00:00
mach-orion5x
ARM: io: make iounmap() a simple macro
2010-12-08 13:57:04 +00:00
mach-pnx4008
Merge branch 'smp' into misc
2011-01-06 22:32:03 +00:00
mach-pxa
Merge branch 'misc' into devel
2011-01-06 22:32:52 +00:00
mach-realview
Merge branch 'misc' into devel
2011-01-06 22:32:52 +00:00
mach-rpc
ARM: 6484/1: fix compile warning in mm/init.c
2010-11-21 22:05:56 +00:00
mach-s3c24a0/include/mach
Merge branch 'for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into devel-stable
2010-10-28 12:27:34 +01:00
mach-s3c64xx
ARM: S3C64XX: fix uart clock setup for mini6410/real6410
2010-11-25 10:58:11 +09:00
mach-s3c2400
…
mach-s3c2410
ARM: S3C2410: Adapt h1940-bluetooth to gpiolib changes
2010-11-25 10:58:10 +09:00
mach-s3c2412
Merge branch 'misc' into devel
2011-01-06 22:32:52 +00:00
mach-s3c2416
ARM S3C24XX: Fix compilation of PM code for S3C2416
2010-12-17 14:45:01 +09:00
mach-s3c2440
ARM: S3C24XX: Fix mess with gpio {set,get}_pull callbacks
2010-12-08 01:04:56 +00:00
mach-s3c2443
ARM: S3C2443: Select properly ARM core type
2010-11-30 08:44:09 +00:00
mach-s5p64x0
Merge branch 'for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into devel-stable
2010-10-28 12:27:34 +01:00
mach-s5p6442
Merge branch 'for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into devel-stable
2010-10-28 12:27:34 +01:00
mach-s5pc100
Merge branch 'for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into devel-stable
2010-10-28 12:27:34 +01:00
mach-s5pv210
ARM: S5PV210: update MAX8998 platform data to get rid of WARN()
2010-12-17 14:47:42 +09:00
mach-s5pv310
Merge branch 'misc' into devel
2011-01-06 22:32:52 +00:00
mach-sa1100
Merge branch 'clksrc' into devel
2011-01-05 18:09:03 +00:00
mach-shark
ARM: 6484/1: fix compile warning in mm/init.c
2010-11-21 22:05:56 +00:00
mach-shmobile
Merge branch 'misc' into devel
2011-01-06 22:32:52 +00:00
mach-spear3xx
…
mach-spear6xx
…
mach-stmp37xx
arm: remove machine_desc.io_pg_offst and .phys_io
2010-10-20 00:27:46 -04:00
mach-stmp378x
arm: remove machine_desc.io_pg_offst and .phys_io
2010-10-20 00:27:46 -04:00
mach-tcc8k
Merge branch 'misc' into devel
2011-01-06 22:32:52 +00:00
mach-tegra
Merge branch 'misc' into devel
2011-01-06 22:32:52 +00:00
mach-u300
Merge branch 'misc' into devel
2011-01-06 22:32:52 +00:00
mach-ux500
Merge branch 'misc' into devel
2011-01-06 22:32:52 +00:00
mach-versatile
Merge branch 'misc' into devel
2011-01-06 22:32:52 +00:00
mach-vexpress
Merge branch 'misc' into devel
2011-01-06 22:32:52 +00:00
mach-w90x900
Merge branch 'misc' into devel
2011-01-06 22:32:52 +00:00
mm
Merge branch 'misc' into devel
2011-01-06 22:32:52 +00:00
nwfpe
Update broken web addresses in arch directory.
2010-10-18 11:03:21 +02:00
oprofile
oprofile: Abstract the perf-events backend
2010-10-11 17:46:16 +02:00
plat-iop
Merge branch 'clksrc' into devel
2011-01-05 18:09:03 +00:00
plat-mxc
ARM: mxc: update clock source registration
2010-12-22 22:44:39 +00:00
plat-nomadik
ARM: nomadik: convert sched_clock() to use new infrastructure
2010-12-22 22:44:48 +00:00
plat-omap
Merge branch 'misc' into devel
2011-01-06 22:32:52 +00:00
plat-orion
ARM: orion: convert sched_clock() to use new infrastructure
2010-12-22 22:44:49 +00:00
plat-pxa
mmc: sdhci: 8-bit bus width changes
2010-11-22 15:12:04 -05:00
plat-s3c24xx
ARM: S3C24XX: Fix CONFIG_S3C_DEV_NAND Kconfig entry
2010-12-17 14:44:54 +09:00
plat-s5p
ARM: S5P: Add initial map for GPIO2 and GPIO3
2010-10-25 16:06:22 +09:00
plat-samsung
ARM: S3C24XX: Fix mess with gpio {set,get}_pull callbacks
2010-12-08 01:04:56 +00:00
plat-spear
Merge branch 'misc' into devel
2011-01-06 22:32:52 +00:00
plat-stmp3xxx
Merge branch 'misc' into devel
2011-01-06 22:32:52 +00:00
plat-tcc
arm: return both physical and virtual addresses from addruart
2010-10-20 00:27:33 -04:00
plat-versatile
Merge branch 'clksrc' into devel
2011-01-05 18:09:03 +00:00
tools
ARM: Update mach-types
2010-12-12 23:31:02 +00:00
vfp
Merge branch 'misc' into devel
2011-01-06 22:32:52 +00:00
Kconfig
Merge branch 'misc' into devel
2011-01-06 22:32:52 +00:00
Kconfig-nommu
…
Kconfig.debug
Merge branch 'misc' into devel
2011-01-06 22:32:52 +00:00
Makefile
Merge branch 'for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into devel-stable
2010-10-19 20:12:24 +01:00