FEX-Emu/linux
1
0
Fork 0
mirror of https://github.com/FEX-Emu/linux.git synced 2025-02-04 01:57:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
linux/arch/arm
History
Arnd Bergmann 8cef081c71 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into fixes 
The merge of the 'clk-for-linus' branch caused an automated
merge failure. Pull that in here so we can fix the problem.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2012-07-25 14:35:04 +02:00
..
boot
The common clk framework changes for 3.6 include a small number of core
2012-07-24 16:40:57 -07:00
common
ARM: dma-mapping: fix debug messages in dmabounce code
2012-06-13 14:25:16 +02:00
configs
arm-soc: defconfig updates
2012-07-23 16:33:28 -07:00
include/asm
arm-soc: sparse IRQ conversion
2012-07-23 17:36:02 -07:00
kernel
PCI changes for the 3.6 merge window:
2012-07-24 16:17:07 -07:00
lib
…
mach-at91
arm-soc: device tree description updates
2012-07-23 16:17:43 -07:00
mach-bcmring
…
mach-clps711x
ARM: clps711x: Remove the setting of the time
2012-07-17 22:24:30 +02:00
mach-cns3xxx
ARM: PCI: provide a default bus scan implementation
2012-05-13 17:12:17 +01:00
mach-davinci
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2012-07-24 13:34:56 -07:00
mach-dove
ARM: Orion: Fix WDT compile for Dove and MV78xx0
2012-07-04 10:37:34 +02:00
mach-ebsa110
…
mach-ep93xx
arm-soc: soc-specific updates
2012-07-23 16:08:40 -07:00
mach-exynos
arm-soc: board specific updates
2012-07-23 17:34:48 -07:00
mach-footbridge
ARM: PCI: provide a default bus scan implementation
2012-05-13 17:12:17 +01:00
mach-gemini
…
mach-h720x
…
mach-highbank
clk: add highbank clock support
2012-07-11 17:58:47 -07:00
mach-imx
arm-soc: clk changes
2012-07-23 17:51:03 -07:00
mach-integrator
ARM: integrator: convert to common clock
2012-07-11 17:58:45 -07:00
mach-iop13xx
ARM: PCI: get rid of pci_std_swizzle()
2012-05-13 17:12:16 +01:00
mach-iop32x
ARM: PCI: provide a default bus scan implementation
2012-05-13 17:12:17 +01:00
mach-iop33x
ARM: PCI: provide a default bus scan implementation
2012-05-13 17:12:17 +01:00
mach-ixp4xx
- More robust parsing especially of xattr data in JFFS2
2012-06-01 16:55:42 -07:00
mach-kirkwood
ARM: Orion: Fix Virtual/Physical mixup with watchdog
2012-06-23 16:19:21 -07:00
mach-ks8695
ARM: PCI: provide a default bus scan implementation
2012-05-13 17:12:17 +01:00
mach-l7200/include/mach
…
mach-lpc32xx
ARM: LPC32xx: Add PWM clock
2012-07-20 14:01:51 +02:00
mach-mmp
ARM: mmp: remove mach/gpio-pxa.h
2012-07-04 15:58:11 +08:00
mach-msm
arm-soc: sweeping late_initcall cleanup
2012-05-26 13:14:01 -07:00
mach-mv78xx0
ARM: Orion: Fix WDT compile for Dove and MV78xx0
2012-07-04 10:37:34 +02:00
mach-mvebu
arm: mvebu: generate DTBs for supported SoCs
2012-07-17 22:38:06 +02:00
mach-mxs
arm-soc: device tree description updates
2012-07-23 16:17:43 -07:00
mach-netx
…
mach-nomadik
ARM: nomadik: bump all IRQ numbers by one
2012-06-11 12:40:14 +02:00
mach-omap1
arm-soc: timer updates
2012-07-23 16:21:23 -07:00
mach-omap2
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2012-07-24 13:34:56 -07:00
mach-orion5x
ARM: Orion: Fix Virtual/Physical mixup with watchdog
2012-06-23 16:19:21 -07:00
mach-picoxcell
clocksource: dw_apb_timer: Add common DTS glue for dw_apb_timer
2012-07-12 17:26:09 +02:00
mach-pnx4008
arm-soc: sweeping late_initcall cleanup
2012-05-26 13:14:01 -07:00
mach-prima2
PINCTRL: SiRF: add GPIO and GPIO irq support in CSR SiRFprimaII
2012-07-02 10:59:07 +08:00
mach-pxa
ARM: pxa: hx4700: Fix basic suspend/resume
2012-07-01 14:40:58 +08:00
mach-realview
…
mach-rpc
ARM: fiq: change FIQ_START to a variable
2012-07-01 21:59:19 +08:00
mach-s3c24xx
arm-soc: device tree description updates
2012-07-23 16:17:43 -07:00
mach-s3c64xx
arm-soc: board specific updates
2012-07-23 17:34:48 -07:00
mach-s3c2410
…
mach-s3c2412
…
mach-s3c2440
…
mach-s5p64x0
arm-soc: device tree description updates
2012-07-23 16:17:43 -07:00
mach-s5pc100
arm-soc: device tree description updates
2012-07-23 16:17:43 -07:00
mach-s5pv210
arm-soc: board specific updates
2012-07-23 17:34:48 -07:00
mach-sa1100
Merge branch 'for-linus' of git://git.linaro.org/people/rmk/linux-arm
2012-05-29 18:21:44 -07:00
mach-shark
ARM: PCI: provide a default bus scan implementation
2012-05-13 17:12:17 +01:00
mach-shmobile
ARM: shmobile: fix platsmp.c build when ARCH_SH73A0=n
2012-07-06 22:00:20 +02:00
mach-socfpga
ARM: socfpga: initial support for Altera's SOCFPGA platform
2012-07-19 10:39:00 +02:00
mach-spear3xx
Clk:spear3xx:Fix: Rename clk ids within predefined limit
2012-07-18 10:04:39 +05:30
mach-spear6xx
Clk:spear6xx:Fix: Rename clk ids within predefined limit
2012-07-18 10:04:42 +05:30
mach-spear13xx
Viresh has moved
2012-06-20 14:39:36 -07:00
mach-tegra
ARM: tegra: harmony: add regulator supply name and its input supply
2012-07-24 21:22:33 +02:00
mach-u300
ARM: u300: convert to common clock
2012-07-11 15:36:45 -07:00
mach-ux500
Sound update for 3.6-rc1
2012-07-24 13:37:37 -07:00
mach-versatile
ARM: fix mach-versatile/pci.c warning
2012-07-04 17:04:57 +01:00
mach-vexpress
ARM: vexpress: Config option for early printk console
2012-07-13 11:48:29 +01:00
mach-vt8500
ARM:vt8500: Convert to use .restart and remove arch_reset()
2012-07-18 18:51:55 +02:00
mach-w90x900
…
mach-zynq
…
mm
Merge branch 'fixes-for-linus' of git://git.linaro.org/people/mszyprowski/linux-dma-mapping
2012-07-17 08:43:12 -07:00
net
ARM: 7421/1: bpf_jit: BPF_S_ANC_ALU_XOR_X support
2012-06-14 15:12:13 +01:00
nwfpe
…
oprofile
…
plat-iop
ARM: PCI: provide a default bus scan implementation
2012-05-13 17:12:17 +01:00
plat-mxc
arm-soc: clk changes
2012-07-23 17:51:03 -07:00
plat-nomadik
ARM: nomadik: enable PINCTRL_NOMADIK where needed
2012-05-15 14:42:57 +02:00
plat-omap
arm-soc: clk changes
2012-07-23 17:51:03 -07:00
plat-orion
ARM: Orion: Fix Virtual/Physical mixup with watchdog
2012-06-23 16:19:21 -07:00
plat-pxa
ARM: MMP: add pxa910-ssp into ssp_id_table
2012-06-11 12:25:50 +08:00
plat-s3c24xx
ARM: fiq: change FIQ_START to a variable
2012-07-01 21:59:19 +08:00
plat-samsung
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2012-07-24 13:34:56 -07:00
plat-spear
Viresh has moved
2012-06-20 14:39:36 -07:00
plat-versatile
ARM: versatile: Make plat-versatile clock optional
2012-07-12 16:16:56 +01:00
tools
…
vfp
Merge branch 'misc' into for-linus
2012-05-21 15:15:24 +01:00
Kconfig
The common clk framework changes for 3.6 include a small number of core
2012-07-24 16:40:57 -07:00
Kconfig-nommu
…
Kconfig.debug
ARM: vexpress: Config option for early printk console
2012-07-13 11:48:29 +01:00
Makefile
ARM: socfpga: initial support for Altera's SOCFPGA platform
2012-07-19 10:39:00 +02:00