q3k
/
linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
linux/arch/arm
History
Olof Johansson b612a85792 Merge branch 'next/soc' into next/multiplatform 
* next/soc: (50 commits)
  ARM: OMAP: AM33xx hwmod: fixup SPI after platform_data move
  MAINTAINERS: add an entry for the BCM2835 ARM sub-architecture
  ARM: bcm2835: instantiate console UART
  ARM: bcm2835: add stub clock driver
  ARM: bcm2835: add system timer
  ARM: bcm2835: add interrupt controller driver
  ARM: add infra-structure for BCM2835 and Raspberry Pi
  ARM: tegra20: add CPU hotplug support
  ARM: tegra30: add CPU hotplug support
  ARM: tegra: clean up the common assembly macros into sleep.h
  ARM: tegra: replace the CPU CAR access code by tegra_cpu_car_ops
  ARM: tegra: introduce tegra_cpu_car_ops structures
  ARM: Tegra: Add smp_twd clock for Tegra20
  ARM: AM33XX: clock: Add dcan clock aliases for device-tree
  ARM: OMAP2+: dpll: Add missing soc_is_am33xx() check for common functions
  ARM: OMAP: omap_device: idle devices with no driver bound
  ARM: OMAP: omap_device: don't attempt late suspend if no driver bound
  ARM: OMAP: omap_device: keep track of driver bound status
  ARM: OMAP3+: hwmod: Add AM33XX HWMOD data
  ARM: OMAP2+: hwmod: Hook-up am33xx support in omap_hwmod framework
  ...

Change/remove conflict in arch/arm/mach-ux500/clock.c resolved.

Signed-off-by: Olof Johansson <olof@lixom.net>
 		2012-09-20 21:27:41 -07:00
..
boot Merge branch 'next/soc' into next/multiplatform 2012-09-20 21:27:41 -07:00
common
…
configs Merge branch 'next/soc' into next/multiplatform 2012-09-20 21:27:41 -07:00
include/asm Merge branch 'next/dt' into next/multiplatform 2012-09-20 21:16:43 -07:00
kernel ARM: tegra: switch to dmaengine 2012-09-20 19:57:38 -07:00
lib ARM: 7529/1: delay: set loops_per_jiffy when moving to timer-based loop 2012-09-09 17:28:48 +01:00
mach-at91 ARM: at91/clock: fix PLLA overclock warning 2012-08-23 15:00:09 +02:00
mach-bcm2835 ARM: bcm2835: add stub clock driver 2012-09-19 19:08:53 -06:00
mach-bcmring Bunch of perf updates for the ARM backend that pave the way for 2012-09-04 22:12:41 -07:00
mach-clps711x
…
mach-cns3xxx
…
mach-davinci ARM: davinci: remove broken ntosd2_init_i2c 2012-08-10 13:14:36 +02:00
mach-dove Merge branch 'next/dt' into next/multiplatform 2012-09-20 21:16:43 -07:00
mach-ebsa110
…
mach-ep93xx
…
mach-exynos Merge branch 'samsung/cleanup' into next/cleanup 2012-09-20 16:35:21 -07:00
mach-footbridge
…
mach-gemini ARM: gemini: fix the gemini build 2012-09-04 22:17:34 -07:00
mach-h720x
…
mach-highbank
…
mach-imx Merge branch 'next/soc' into next/multiplatform 2012-09-20 21:27:41 -07:00
mach-integrator Merge commit 'a849088aa1' from rmk/fixes into cleanup/io-pci 2012-09-04 15:01:37 +02:00
mach-iop13xx
…
mach-iop32x
…
mach-iop33x
…
mach-ixp4xx
…
mach-kirkwood Remove the ancient omap specific atags that are no longer needed. 2012-09-16 19:28:42 -07:00
mach-ks8695 ARM: ks8695: convert to generic time and clocksource 2012-09-05 08:49:22 +02:00
mach-l7200/include/mach
…
mach-lpc32xx ARM: LPC32xx: Remove board specific GPIO init 2012-09-06 11:39:29 +02:00
mach-mmp Merge branch 'next/dt' into next/multiplatform 2012-09-20 21:16:43 -07:00
mach-msm These patches migrate both the 8660 and 8960 targets on msm to be 2012-09-16 18:03:50 -07:00
mach-mv78xx0 Merge branch 'clk' of git://github.com/hzhuang1/linux into next/cleanup 2012-09-12 22:34:11 -07:00
mach-mvebu
…
mach-mxs ARM: mxs: m28evk: Disable OCOTP OUI loading 2012-09-19 22:00:37 +08:00
mach-netx
…
mach-nomadik
…
mach-omap1 ARM: OMAP1: Move irda.h from plat to mach 2012-09-20 15:03:58 -07:00
mach-omap2 Merge branch 'next/soc' into next/multiplatform 2012-09-20 21:27:41 -07:00
mach-orion5x Merge branch 'clk' of git://github.com/hzhuang1/linux into next/cleanup 2012-09-12 22:34:11 -07:00
mach-picoxcell
…
mach-prima2 Merge branch 'next/dt' into next/multiplatform 2012-09-20 21:16:43 -07:00
mach-pxa Merge branch 'next/dt' into next/multiplatform 2012-09-20 21:16:43 -07:00
mach-realview Merge branch 'next/dt' into next/multiplatform 2012-09-20 21:16:43 -07:00
mach-rpc
…
mach-s3c24xx Merge branch 'samsung/cleanup' into next/cleanup 2012-09-20 16:35:21 -07:00
mach-s3c64xx
…
mach-s3c2410
…
mach-s3c2412
…
mach-s3c2440
…
mach-s5p64x0
…
mach-s5pc100
…
mach-s5pv210
…
mach-sa1100 ARM: sa1100: include linux/io.h in hackkit leds code 2012-08-09 15:16:42 +02:00
mach-shark
…
mach-shmobile Merge branch 'next/soc' into next/multiplatform 2012-09-20 21:27:41 -07:00
mach-socfpga
…
mach-spear3xx Merge branch 'dmaengine' of git://git.linaro.org/people/rmk/linux-arm 2012-08-01 16:41:07 -07:00
mach-spear6xx Merge branch 'dmaengine' of git://git.linaro.org/people/rmk/linux-arm 2012-08-01 16:41:07 -07:00
mach-spear13xx
…
mach-tegra Merge branch 'next/soc' into next/multiplatform 2012-09-20 21:27:41 -07:00
mach-u300 ARM: u300: convert to sparse IRQs 2012-08-13 13:53:07 +02:00
mach-ux500 Merge branch 'next/soc' into next/multiplatform 2012-09-20 21:27:41 -07:00
mach-versatile
…
mach-vexpress ARM: pmu: remove arm_pmu_type enumeration 2012-08-23 11:35:51 +01:00
mach-vt8500
…
mach-w90x900
…
mach-zynq
…
mm Merge branch 'next/dt' into next/multiplatform 2012-09-20 21:16:43 -07:00
net
…
nwfpe
…
oprofile
…
plat-iop Bunch of perf updates for the ARM backend that pave the way for 2012-09-04 22:12:41 -07:00
plat-mxc Merge branch 'next/soc' into next/multiplatform 2012-09-20 21:27:41 -07:00
plat-nomadik
…
plat-omap Merge branch 'next/soc' into next/multiplatform 2012-09-20 21:27:41 -07:00
plat-orion ARM: Orion: Set eth packet size csum offload limit 2012-08-15 13:58:09 +00:00
plat-pxa
…
plat-s3c24xx ARM: S3C24XX: Fix s3c2410_dma_enqueue parameters 2012-08-08 09:04:51 +09:00
plat-samsung Merge branch 'samsung/cleanup' into next/cleanup 2012-09-20 16:35:21 -07:00
plat-spear Merge branch 'dmaengine' of git://git.linaro.org/people/rmk/linux-arm 2012-08-01 16:41:07 -07:00
plat-versatile
…
tools ARM: mach-pnx4008: Remove architecture 2012-08-26 16:30:37 +02:00
vfp ARM: 7483/1: vfp: only advertise VFPv4 in hwcaps if CONFIG_VFPv3 is enabled 2012-08-11 09:15:57 +01:00
Kconfig Merge branch 'next/soc' into next/multiplatform 2012-09-20 21:27:41 -07:00
Kconfig-nommu
…
Kconfig.debug ARM: 7521/1: Fix semihosting Kconfig text 2012-09-07 20:40:44 +01:00
Makefile Merge branch 'next/soc' into next/multiplatform 2012-09-20 21:27:41 -07:00