iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
linux/arch/arm
History
Paul Mundt 701ec7a7b0 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 
Conflicts:
	arch/arm/configs/ap4evb_defconfig
	arch/arm/configs/g3evm_defconfig
	arch/arm/configs/g4evm_defconfig

Signed-off-by: Paul Mundt <lethal@linux-sh.org>
2010-08-04 11:56:17 +09:00
..
boot
Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm
2010-08-03 14:31:24 -07:00
common
Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm
2010-08-03 14:31:24 -07:00
configs
Merge branch 'devel-stable' into devel
2010-07-31 14:20:16 +01:00
include/asm
Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm
2010-08-03 14:31:24 -07:00
kernel
Merge branch 'devel-stable' into devel
2010-07-31 14:20:16 +01:00
lib
Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm
2010-08-03 14:31:24 -07:00
mach-aaec2000
ARM: Remove DISCONTIGMEM support
2010-07-16 10:57:35 +01:00
mach-at91
ARM: 6209/3: at91_udc: Add vbus polarity and polling mode
2010-07-18 20:39:10 +01:00
mach-bcmring
ARM: AMBA: Add pclk definition for platforms using primecells
2010-07-22 09:55:38 +01:00
mach-clps711x
Merge branches 'at91', 'ep93xx', 'kexec', 'iop', 'lmb', 'nomadik', 'nuc', 'pl', 'spear' and 'versatile' into devel
2010-07-31 14:19:35 +01:00
mach-cns3xxx
ARM: cns3xxx: Add support for AHCI controllers
2010-06-08 17:37:09 +04:00
mach-davinci
Merge branches 'at91', 'ep93xx', 'kexec', 'iop', 'lmb', 'nomadik', 'nuc', 'pl', 'spear' and 'versatile' into devel
2010-07-31 14:19:35 +01:00
mach-dove
[ARM] Dove: platform device registration for the sdio interfaces
2010-07-16 22:01:59 -04:00
mach-ebsa110
ARM: 5910/1: ARM: Add tmp register for addruart and loadsp
2010-02-12 17:27:52 +00:00
mach-ep93xx
Merge branches 'at91', 'ep93xx', 'kexec', 'iop', 'lmb', 'nomadik', 'nuc', 'pl', 'spear' and 'versatile' into devel
2010-07-31 14:19:35 +01:00
mach-footbridge
ARM: 6233/1: Delete a wrong redundant right parenthesis
2010-07-22 09:20:50 +01:00
mach-gemini
Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm
2010-03-01 09:15:15 -08:00
mach-h720x
ARM: 6258/1: arm/h720x: fix debug macro compilation failure
2010-07-26 10:33:05 +01:00
mach-imx
imx: move gpio init after to irq init
2010-07-26 15:05:35 +02:00
mach-integrator
Merge branch 'misc' into devel
2010-07-31 14:20:02 +01:00
mach-iop13xx
Merge branch 'misc' into devel
2010-07-31 14:20:02 +01:00
mach-iop32x
Merge branch 'devel-stable' into devel
2010-05-17 17:24:04 +01:00
mach-iop33x
include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h
2010-03-30 22:02:32 +09:00
mach-ixp4xx
Merge branch 'misc' into devel
2010-07-31 14:20:02 +01:00
mach-ixp23xx
ARM: 6269/1: Add 'code' parameter for hook_fault_code()
2010-07-27 10:48:34 +01:00
mach-ixp2000
ARM: 6269/1: Add 'code' parameter for hook_fault_code()
2010-07-27 10:48:34 +01:00
mach-kirkwood
Merge branch 'wells/lpc32xx-arch_v2' of git://git.lpclinux.com/linux-2.6-lpc into devel-stable
2010-07-29 15:48:02 +01:00
mach-ks8695
ARM: 6269/1: Add 'code' parameter for hook_fault_code()
2010-07-27 10:48:34 +01:00
mach-lh7a40x
ARM: Remove DISCONTIGMEM support
2010-07-16 10:57:35 +01:00
mach-loki
Merge branch 'misc2' into devel
2010-02-25 22:09:41 +00:00
mach-lpc32xx
ARM: LPC32XX: Arch config menu supoport and makefiles
2010-07-27 08:46:22 -07:00
mach-mmp
[ARM] mmp: append device support in jasper
2010-05-11 17:25:06 +02:00
mach-msm
Merge branch 'devel-stable' into devel
2010-07-31 14:20:16 +01:00
mach-mv78xx0
Merge branch 'origin' into devel-stable
2010-03-08 20:21:04 +00:00
mach-mx3
Merge branch 'for-rmk' of git://git.pengutronix.de/git/imx/linux-2.6 into devel-stable
2010-07-29 15:48:37 +01:00
mach-mx5
i.MX51: add support for cpuimx51 module and its baseboard
2010-07-26 15:05:37 +02:00
mach-mx25
imx: move gpio init after to irq init
2010-07-26 15:05:35 +02:00
mach-mxc91231
ARM: mxc91231: remove paragraphs with old address of the FSF
2010-06-30 09:00:27 +02:00
mach-netx
include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h
2010-03-30 22:02:32 +09:00
mach-nomadik
ARM: AMBA: Add pclk definition for platforms using primecells
2010-07-22 09:55:38 +01:00
mach-ns9xxx
ARM: 6263/1: ns9xxx: fix FTBFS for zImage
2010-07-26 10:33:07 +01:00
mach-nuc93x
ARM: 5859/1: Add nuc93x platform support
2010-01-27 22:03:00 +00:00
mach-omap1
ARM: OMAP: Convert to use ->reserve method to reserve boot time memory
2010-07-16 11:06:41 +01:00
mach-omap2
Merge branches 'at91', 'ep93xx', 'kexec', 'iop', 'lmb', 'nomadik', 'nuc', 'pl', 'spear' and 'versatile' into devel
2010-07-31 14:19:35 +01:00
mach-orion5x
[ARM] Orion: DNS-323 C1 requires phylib
2010-07-16 22:02:48 -04:00
mach-pnx4008
include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h
2010-03-30 22:02:32 +09:00
mach-pxa
Merge branches 'at91', 'ep93xx', 'kexec', 'iop', 'lmb', 'nomadik', 'nuc', 'pl', 'spear' and 'versatile' into devel
2010-07-31 14:19:35 +01:00
mach-realview
Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm
2010-08-03 14:31:24 -07:00
mach-rpc
include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h
2010-03-30 22:02:32 +09:00
mach-s3c24a0/include/mach
Merge branch 'origin' into devel-stable
2010-03-08 20:21:04 +00:00
mach-s3c64xx
ARM: S3C64XX: Add USB OTG HCLK to the list of clocks
2010-05-28 19:31:34 +09:00
mach-s3c2400
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2009-12-09 19:43:33 -08:00
mach-s3c2410
ARM: Convert platform reservations to use LMB rather than bootmem
2010-07-27 08:48:23 +01:00
mach-s3c2412
ARM: Remove DISCONTIGMEM support
2010-07-16 10:57:35 +01:00
mach-s3c2416
ARM: SMDK2416: Add support for framebuffer device and ensure correct setup
2010-05-18 18:46:30 +09:00
mach-s3c2440
ARM: Convert platform reservations to use LMB rather than bootmem
2010-07-27 08:48:23 +01:00
mach-s3c2443
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2010-05-20 09:20:59 -07:00
mach-s5p6440
ARM: S5P: Fix the platform external interrupt issues.
2010-05-26 19:09:50 +09:00
mach-s5p6442
ARM: S5P6442: Fix PLL setting announce message.
2010-07-05 16:01:04 +09:00
mach-s5pc100
ARM: S5PC100: Fixup cross tree merge problems
2010-05-26 19:09:50 +09:00
mach-s5pv210
ARM: S5PV210: Correct clock register properties
2010-07-05 16:01:04 +09:00
mach-sa1100
ARM: Remove 'node' argument form arch_adjust_zones()
2010-07-16 10:57:36 +01:00
mach-shark
Merge branches 'at91', 'ep93xx', 'kexec', 'iop', 'lmb', 'nomadik', 'nuc', 'pl', 'spear' and 'versatile' into devel
2010-07-31 14:19:35 +01:00
mach-shmobile
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
2010-08-04 11:56:17 +09:00
mach-spear3xx
ARM: AMBA: Add pclk definition for platforms using primecells
2010-07-22 09:55:38 +01:00
mach-spear6xx
ARM: AMBA: Add pclk definition for platforms using primecells
2010-07-22 09:55:38 +01:00
mach-stmp37xx
…
mach-stmp378x
…
mach-u300
Merge branch 'misc' into devel
2010-07-31 14:20:02 +01:00
mach-ux500
Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm
2010-08-03 14:31:24 -07:00
mach-versatile
Merge branches 'at91', 'ep93xx', 'kexec', 'iop', 'lmb', 'nomadik', 'nuc', 'pl', 'spear' and 'versatile' into devel
2010-07-31 14:19:35 +01:00
mach-vexpress
Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm
2010-08-03 14:31:24 -07:00
mach-w90x900
Merge branches 'at91', 'ep93xx', 'kexec', 'iop', 'lmb', 'nomadik', 'nuc', 'pl', 'spear' and 'versatile' into devel
2010-07-31 14:19:35 +01:00
mm
Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm
2010-08-03 14:31:24 -07:00
nwfpe
ARM: arch/arm/nwfpe/fpsr.h: Checkpatch cleanup
2010-05-24 20:40:12 +01:00
oprofile
ARM: 6074/1: oprofile: convert from sysdev to platform device
2010-05-17 11:53:59 +01:00
plat-iop
Merge branch 'misc' into devel
2010-07-31 14:20:02 +01:00
plat-mxc
mx2_camera: Add soc_camera support for i.MX25/i.MX27
2010-07-28 09:28:36 +02:00
plat-nomadik
ARM: 6153/1: nomadik MTU to use dynamic shift and mult assignment
2010-06-16 22:29:31 +01:00
plat-omap
ARM: OMAP: Convert OMAPFB and VRAM SDRAM reservation to LMB
2010-07-27 08:48:23 +01:00
plat-orion
[ARM] orion/kirkwood: reset PCIe unit on boot
2010-07-16 22:01:57 -04:00
plat-pxa
[ARM] mmp: fix build failure due to IRQ_PMU depends on ARCH_PXA
2010-06-14 00:45:26 +08:00
plat-s3c24xx
ARM: SAMSUNG: Move WDT device definitions in plat-samsung
2010-05-20 19:44:18 +09:00
plat-s5p
ARM: S5P: Bug fix on external interrupt for S5P SoCs
2010-07-05 16:01:04 +09:00
plat-samsung
ARM: SAMSUNG: Fix on wrong function name for S5PV210 sdhci0
2010-07-05 16:01:04 +09:00
plat-spear
Merge branches 'at91', 'ep93xx', 'kexec', 'iop', 'lmb', 'nomadik', 'nuc', 'pl', 'spear' and 'versatile' into devel
2010-07-31 14:19:35 +01:00
plat-stmp3xxx
include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h
2010-03-30 22:02:32 +09:00
plat-versatile
ARM: 6264/1: fix Versatile Express LED oversight
2010-07-26 10:48:34 +01:00
tools
ARM: Update mach-types
2010-07-12 21:14:53 +01:00
vfp
ARM: 6203/1: Make VFPv3 usable on ARMv6
2010-07-09 14:41:34 +01:00
Kconfig
Merge branch 'devel-stable' into devel
2010-07-31 14:20:16 +01:00
Kconfig-nommu
…
Kconfig.debug
ARM: SAMSUNG: Move plat-s3c Kconfig entries to plat-samsung and plat-s3c24xx
2010-02-24 01:52:06 +00:00
Makefile
Merge branch 'devel-stable' into devel
2010-07-31 14:20:16 +01:00