sugar/linux
1
0
Fork 0
Code Activity
Files
d2819f80d465672b09c2f4cb52303b7f951c4d0f
linux/arch/arm
History
Arnd Bergmann d2819f80d4 Merge branch 'spear/pinctrl' into spear/clock 
Conflicts:
	arch/arm/mach-spear3xx/Makefile
	arch/arm/mach-spear3xx/clock.c
	arch/arm/mach-spear3xx/include/mach/generic.h
	arch/arm/mach-spear6xx/clock.c
	arch/arm/plat-spear/Makefile
	drivers/pinctrl/core.c

This resolves some annoying merge conflicts.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2012-05-14 15:33:42 +02:00
..
boot
SPEAr3xx: Add pinctrl support for boards
2012-04-22 22:49:28 +02:00
common
ARM: 7377/1: vic: re-read status register before dispatching each IRQ handler
2012-04-10 09:27:42 +01:00
configs
Merge branch 'spear/pinctrl' into spear/clock
2012-05-14 15:33:42 +02:00
include/asm
ARM: 7386/1: jump_label: fixup for rename to static_key
2012-04-15 22:00:31 +01:00
kernel
ARM: 7382/1: mm: truncate memory banks to fit in 4GB space for classic MMU
2012-04-15 22:00:30 +01:00
lib
…
mach-at91
ARM: at91: fix at91sam9261ek Ethernet dm9000 irq
2012-04-16 11:08:26 +02:00
mach-bcmring
ARM: bcmring: fix UART declarations
2012-04-18 21:21:45 -07:00
mach-clps711x
Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
2012-03-30 17:00:34 -07:00
mach-cns3xxx
Merge tag 'cleanup2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
2012-03-29 18:02:10 -07:00
mach-davinci
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux
2012-03-30 16:45:39 -07:00
mach-dove
Merge tag 'cleanup2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
2012-03-29 18:02:10 -07:00
mach-ebsa110
Merge tag 'cleanup2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
2012-03-29 18:02:10 -07:00
mach-ep93xx
Merge tag 'cleanup2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
2012-03-29 18:02:10 -07:00
mach-exynos
ARM: EXYNOS: Fix Kconfig dependencies for device tree enabled machine files
2012-04-14 07:53:51 -07:00
mach-footbridge
Merge tag 'cleanup2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
2012-03-29 18:02:10 -07:00
mach-gemini
ARM: remove bunch of now unused mach/io.h files
2012-03-06 21:34:44 -06:00
mach-h720x
Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
2012-03-30 17:00:34 -07:00
mach-highbank
Merge tag 'cleanup2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
2012-03-29 18:02:10 -07:00
mach-imx
ARM: imx: Fix imx5 idle logic bug
2012-04-18 11:52:24 +02:00
mach-integrator
Merge tag 'cleanup2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
2012-03-29 18:02:10 -07:00
mach-iop13xx
Merge tag 'cleanup2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
2012-03-29 18:02:10 -07:00
mach-iop32x
ARM: kill off __mem_pci
2012-03-06 21:34:45 -06:00
mach-iop33x
Merge tag 'cleanup2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
2012-03-29 18:02:10 -07:00
mach-ixp4xx
Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
2012-03-30 17:00:34 -07:00
mach-ixp23xx
Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
2012-03-30 17:00:34 -07:00
mach-ixp2000
Merge tag 'cleanup2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
2012-03-29 18:02:10 -07:00
mach-kirkwood
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux
2012-03-30 16:45:39 -07:00
mach-ks8695
Merge tag 'cleanup2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
2012-03-29 18:02:10 -07:00
mach-l7200/include/mach
…
mach-lpc32xx
Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
2012-03-29 21:30:28 -07:00
mach-mmp
Merge tag 'cleanup2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
2012-03-29 18:02:10 -07:00
mach-msm
ARM: msm: Fix section mismatches in proc_comm.c
2012-04-13 10:23:17 -07:00
mach-mv78xx0
Merge tag 'cleanup2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
2012-03-29 18:02:10 -07:00
mach-mxs
Merge tag 'for-linus-3.4' of git://git.infradead.org/mtd-2.6
2012-03-30 17:31:56 -07:00
mach-netx
ARM: __io abuse cleanup
2012-03-13 21:25:21 -05:00
mach-nomadik
Merge tag 'cleanup2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
2012-03-29 18:02:10 -07:00
mach-omap1
ARM: OMAP1: DMTIMER: fix broken timer clock source selection
2012-04-17 15:30:16 -07:00
mach-omap2
Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
2012-04-21 12:45:52 -07:00
mach-orion5x
Merge tag 'cleanup2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
2012-03-29 18:02:10 -07:00
mach-picoxcell
Merge tag 'cleanup2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
2012-03-29 18:02:10 -07:00
mach-pnx4008
Merge tag 'cleanup2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
2012-03-29 18:02:10 -07:00
mach-prima2
Merge tag 'cleanup2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
2012-03-29 18:02:10 -07:00
mach-pxa
ARM: fix __io macro for PCMCIA
2012-04-05 11:29:55 -07:00
mach-realview
Merge tag 'cleanup2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
2012-03-29 18:02:10 -07:00
mach-rpc
Merge tag 'cleanup2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
2012-03-29 18:02:10 -07:00
mach-s3c24xx
ARM: S3C24XX: fix missing common.h in mach-s3c24xx/
2012-04-02 06:43:23 +09:00
mach-s3c64xx
Merge tag 'cleanup2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
2012-03-29 18:02:10 -07:00
mach-s3c2410
Disintegrate asm/system.h for ARM
2012-03-28 18:30:01 +01:00
mach-s3c2412
Disintegrate asm/system.h for ARM
2012-03-28 18:30:01 +01:00
mach-s3c2440
Disintegrate asm/system.h for ARM
2012-03-28 18:30:01 +01:00
mach-s5p64x0
Merge tag 'cleanup2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
2012-03-29 18:02:10 -07:00
mach-s5pc100
Merge tag 'cleanup2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
2012-03-29 18:02:10 -07:00
mach-s5pv210
ARM: S5PV210: Fix compiler warning in dma.c file
2012-04-10 08:40:19 -07:00
mach-sa1100
ARM: fix lcd power build failure in collie_defconfig
2012-04-02 22:03:44 -07:00
mach-shark
Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
2012-03-30 17:00:34 -07:00
mach-shmobile
Merge tag 'for-linus-3.4' of git://git.infradead.org/mtd-2.6
2012-03-30 17:31:56 -07:00
mach-spear3xx
Merge branch 'spear/pinctrl' into spear/clock
2012-05-14 15:33:42 +02:00
mach-spear6xx
Merge branch 'spear/pinctrl' into spear/clock
2012-05-14 15:33:42 +02:00
mach-tegra
Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
2012-03-29 21:30:28 -07:00
mach-u300
Merge tag 'for-linus-3.4' of git://git.infradead.org/mtd-2.6
2012-03-30 17:31:56 -07:00
mach-ux500
ARM: ux500: Fix unmet direct dependency
2012-04-16 09:00:37 +02:00
mach-versatile
ARM: versatile: fix build failure in pci.c
2012-04-02 22:03:35 -07:00
mach-vexpress
Merge tag 'cleanup2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
2012-03-29 18:02:10 -07:00
mach-vt8500
ARM: remove bunch of now unused mach/io.h files
2012-03-06 21:34:44 -06:00
mach-w90x900
Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
2012-03-30 17:00:34 -07:00
mach-zynq
ARM: remove bunch of now unused mach/io.h files
2012-03-06 21:34:44 -06:00
mm
ARM: 7384/1: ThumbEE: Disable userspace TEEHBR access for !CONFIG_ARM_THUMBEE
2012-04-15 22:00:31 +01:00
net
ARM: 7259/3: net: JIT compiler for packet filters
2012-03-24 09:38:56 +00:00
nwfpe
Disintegrate asm/system.h for ARM
2012-03-28 18:30:01 +01:00
oprofile
…
plat-iop
Merge tag 'split-asm_system_h-for-linus-20120328' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-asm_system
2012-03-28 15:58:21 -07:00
plat-mxc
ARM: 3ds_debugboard: Fix smsc911x driver probe
2012-04-02 11:15:15 +02:00
plat-nomadik
Merge branch 'for-linus' of git://git.linaro.org/people/rmk/linux-arm
2012-03-29 16:53:48 -07:00
plat-omap
Merge tag 'omap-fixes-for-v3.4-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into fixes
2012-04-18 21:24:00 -07:00
plat-orion
ARM: orion: wdt: use resource vice direct access
2012-03-16 04:28:41 +00:00
plat-pxa
Disintegrate asm/system.h for ARM
2012-03-28 18:30:01 +01:00
plat-s3c24xx
ARM: fix builds due to missing <asm/system_misc.h> includes
2012-03-30 15:44:40 -07:00
plat-s5p
Merge branch 'samsung/cleanup-exynos-clock' into next/soc
2012-03-20 10:07:48 +00:00
plat-samsung
ARM: SAMSUNG: make SAMSUNG_PM_DEBUG select DEBUG_LL
2012-04-14 07:42:24 -07:00
plat-spear
Merge branch 'spear/pinctrl' into spear/clock
2012-05-14 15:33:42 +02:00
plat-versatile
Merge branch 'for-linus' of git://git.linaro.org/people/rmk/linux-arm
2012-03-29 16:53:48 -07:00
tools
…
vfp
Disintegrate asm/system.h for ARM
2012-03-28 18:30:01 +01:00
Kconfig
SPEAr: Switch to common clock framework
2012-05-12 21:44:12 +02:00
Kconfig-nommu
…
Kconfig.debug
Merge branch 'for-linus' of git://git.linaro.org/people/rmk/linux-arm
2012-03-29 16:53:48 -07:00
Makefile
Merge branch 'for-linus' of git://git.linaro.org/people/rmk/linux-arm
2012-03-29 16:53:48 -07:00