Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-13 23:51:39 +00:00
Code Issues Packages Projects Releases Wiki Activity
823c9faefc
linux/arch/arm
History
Olof Johansson 823c9faefc Merge branch 'next/cam-samsung' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/soc 
From Kukjin Kim:
Just adding camif gpio setup and clkdev.

* 'next/cam-samsung' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
  ARM: S3C24XX: Add clkdev entry for camif-upll clock
  ARM: SAMSUNG: Add s3c24xx/s3c64xx CAMIF GPIO setup helpers
  + Linux 3.7-rc6

Conflicts due to the 3.7-rc6 sync: arch/arm/mach-highbank/system.c
include/linux/clk-provider.h, resolved as in other branches.

Signed-off-by: Olof Johansson <olof@lixom.net>
2012-11-30 09:27:57 -08:00
..
boot Merge branch 'next/cam-samsung' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/soc 2012-11-30 09:27:57 -08:00
common ARM: config: sort select statements alphanumerically 2012-10-13 17:11:28 +01:00
configs Merge branch 'clps711x/soc2' into next/soc 2012-11-21 09:58:28 -08:00
crypto
include Merge branch 'sunxi/soc2' into next/soc 2012-11-21 10:52:44 -08:00
kernel Merge tag 'highbank-debugll-cleanup' of git://sources.calxeda.com/kernel/linux into next/soc 2012-11-21 02:13:12 -08:00
lib ARM: export default read_current_timer 2012-10-09 20:24:36 +02:00
mach-at91 Two little fixes, one related to the move to sparse irq and 2012-11-16 16:43:58 +01:00
mach-bcm Add support for generic BCM SoC chipsets 2012-11-19 22:39:07 -08:00
mach-bcm2835 ARM: bcm2835: enable GPIO/pinctrl 2012-10-25 20:42:51 -06:00
mach-clps711x ARM: clps711x: Rename board files to match functionality 2012-11-21 09:57:46 -08:00
mach-cns3xxx
mach-davinci ARM: davinci: da8xx: add DA850 PRUSS support 2012-10-27 16:28:36 +05:30
mach-dove ARM: dove: Add crypto engine to DT 2012-10-17 17:20:01 +00:00
mach-ebsa110 ARM: soc: driver specific changes 2012-10-01 18:46:13 -07:00
mach-ep93xx ARM: soc: multiplatform enablement 2012-10-01 19:11:38 -07:00
mach-exynos ARM: EXYNOS: Avoid early use of of_machine_is_compatible() 2012-11-28 09:24:22 -08:00
mach-footbridge ARM: config: sort select statements alphanumerically 2012-10-13 17:11:28 +01:00
mach-gemini
mach-h720x ARM: config: sort select statements alphanumerically 2012-10-13 17:11:28 +01:00
mach-highbank Merge branch 'next/cam-samsung' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/soc 2012-11-30 09:27:57 -08:00
mach-imx Merge branch 'next/cam-samsung' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/soc 2012-11-30 09:27:57 -08:00
mach-integrator ARM: plat-versatile: move FPGA irq driver to drivers/irqchip 2012-11-04 18:09:12 +01:00
mach-iop13xx Merge branch 'late/fixes' into fixes 2012-10-07 07:22:32 -07:00
mach-iop32x Merge branch 'cleanup/__iomem' into next/cleanup 2012-09-22 10:24:29 -07:00
mach-iop33x
mach-ixp4xx ARM: config: sort select statements alphanumerically 2012-10-13 17:11:28 +01:00
mach-kirkwood ARM: Kirkwood: fix disabling CACHE_FEROCEON_L2 2012-10-18 17:04:24 +00:00
mach-ks8695 Merge branch 'late/fixes' into fixes 2012-10-07 07:22:32 -07:00
mach-l7200/include/mach
mach-lpc32xx ARM: LPC32xx: Add the motor PWM clock 2012-11-12 11:27:40 +01:00
mach-mmp ARM: config: sort select statements alphanumerically 2012-10-13 17:11:28 +01:00
mach-msm ARM: config: sort select statements alphanumerically 2012-10-13 17:11:28 +01:00
mach-mv78xx0 Merge branch 'late/fixes' into fixes 2012-10-07 07:22:32 -07:00
mach-mvebu ARM: mvebu: fix build breaks from multi-platform conversion 2012-09-28 22:27:07 +02:00
mach-mxs ARM: soc: multiplatform enablement 2012-10-01 19:11:38 -07:00
mach-netx
mach-nomadik ARM: config: sort select statements alphanumerically 2012-10-13 17:11:28 +01:00
mach-omap1 ASoC: Fixes for v3.7 2012-10-17 14:09:15 +02:00
mach-omap2 Minor OMAP PM and hwmod fixes for v3.7-rc series via 2012-11-12 22:41:39 +01:00
mach-orion5x ARM: soc: late platform updates 2012-10-07 20:55:16 +09:00
mach-picoxcell
mach-prima2 pinctrl: sirf: remove sirfsoc_gpio_set_pull function 2012-10-15 09:09:27 +02:00
mach-pxa ARM: pxa/spitz_pm: Fix hang when resuming from STR 2012-10-28 07:53:45 +08:00
mach-realview ARM: config: sort select statements alphanumerically 2012-10-13 17:11:28 +01:00
mach-rpc ARM: rpc: check device_register return code in ecard_probe 2012-10-07 10:33:09 +02:00
mach-s3c24xx ARM: S3C24XX: Add clkdev entry for camif-upll clock 2012-11-28 08:03:28 +09:00
mach-s3c64xx ARM: config: sort select statements alphanumerically 2012-10-13 17:11:28 +01:00
mach-s3c2410
mach-s3c2412 ARM: config: sort select statements alphanumerically 2012-10-13 17:11:28 +01:00
mach-s3c2440 ARM: config: sort select statements alphanumerically 2012-10-13 17:11:28 +01:00
mach-s5p64x0 ARM: SAMSUNG: Add naming of s3c64xx-spi devices 2012-10-17 16:47:32 +09:00
mach-s5pc100 ARM: SAMSUNG: Add naming of s3c64xx-spi devices 2012-10-17 16:47:32 +09:00
mach-s5pv210 ARM: SAMSUNG: Add naming of s3c64xx-spi devices 2012-10-17 16:47:32 +09:00
mach-sa1100 ARM: config: sort select statements alphanumerically 2012-10-13 17:11:28 +01:00
mach-shark Merge branch 'late/fixes' into fixes 2012-10-07 07:22:32 -07:00
mach-shmobile Merge branch 'soc' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/soc 2012-11-12 21:45:19 +01:00
mach-socfpga
mach-spear3xx
mach-spear6xx
mach-spear13xx ARM: SPEAr: Remove unused empty files 2012-10-25 16:34:18 +02:00
mach-sunxi ARM: sunxi: Add sunxi restart function via onchip watchdog 2012-11-21 09:25:25 +01:00
mach-tegra ARM: tegra: retain L2 content over CPU suspend/resume 2012-11-15 15:09:22 -07:00
mach-u300 ARM: config: sort select statements alphanumerically 2012-10-13 17:11:28 +01:00
mach-ux500 Support for Calxeda ECX-2000 SOC 2012-11-06 06:48:05 -08:00
mach-versatile ARM: plat-versatile: move FPGA irq driver to drivers/irqchip 2012-11-04 18:09:12 +01:00
mach-vexpress ARM: vexpress: Remove motherboard dependencies in the DTS files 2012-11-05 17:09:52 +00:00
mach-vt8500 arm: vt8500: Fix build warning in uncompress.h 2012-10-07 14:50:06 -07:00
mach-w90x900
mach-zynq
mm Merge tag 'highbank-debugll-cleanup' of git://sources.calxeda.com/kernel/linux into next/soc 2012-11-21 02:13:12 -08:00
net
nwfpe
oprofile
plat-iop
plat-mxc/devices ARM : i.MX27 : split code for allocation of ressources of camera and eMMA 2012-11-16 16:21:48 +01:00
plat-nomadik ARM: config: sort select statements alphanumerically 2012-10-13 17:11:28 +01:00
plat-omap ARM: OMAP2+: hwmod: add flag to prevent hwmod code from touching IP block during init 2012-10-31 05:02:31 -06:00
plat-orion Merge branch 'samsung_platform_data' into staging/for_v3.7 2012-10-05 22:32:05 -03:00
plat-pxa
plat-s3c24xx ARM: config: sort select statements alphanumerically 2012-10-13 17:11:28 +01:00
plat-samsung Merge branch 'next/cam-samsung' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/soc 2012-11-30 09:27:57 -08:00
plat-spear gpio: SPEAr: add spi chipselect control driver 2012-11-18 00:01:27 +01:00
plat-versatile ARM: plat-versatile: move FPGA irq driver to drivers/irqchip 2012-11-04 18:09:12 +01:00
tools ARM: boot: Fix usage of kecho 2012-11-12 23:22:54 +01:00
vfp ARM: 7566/1: vfp: fix save and restore when running on pre-VFPv3 and CONFIG_VFPv3 set 2012-10-29 10:04:05 +00:00
xen xen/arm: Fix compile errors when drivers are compiled as modules (export more). 2012-11-09 07:48:22 -05:00
Kconfig Merge branch 'clps711x/soc2' into next/soc 2012-11-21 09:58:28 -08:00
Kconfig-nommu
Kconfig.debug Merge branch 'sunxi/soc2' into next/soc 2012-11-21 10:52:44 -08:00
Makefile Allwinner SoC support for 3.8 2012-11-20 22:14:59 -08:00