system/linux
system/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux synced 2024-10-02 01:10:22 +00:00
Code Issues Packages Projects Releases Wiki Activity
linux/arch/arm
History
Arnd Bergmann e594a97c8c Merge branch 'v3.4/features' of git://gitorious.org/linux-davinci/linux-davinci into next/drivers 
* 'v3.4/features' of git://gitorious.org/linux-davinci/linux-davinci:
  ARM: davinci: dm644x evm: add support for VPBE display
  ARM: davinci: dm644x: add support for v4l2 video display

* included from the davinci/cleanup branch:
  ARM: davinci: dm644x: don't force vpfe registeration on all boards
  ARM: davinci: dm644x: fix inconsistent variable naming
  ARM: davinci: dm644x: improve readability using macro
  ARM: davinci: streamline sysmod access
  ARM: davinci: create new common platform header for davinci
  ARM: davinci: dm646x: move private definitions to C file
  ARM: davinci: dm365: move private definitions to C file
  ARM: davinci: dm644x: move private definitions to C file

Conflicts:
	arch/arm/mach-davinci/board-dm644x-evm.c
	arch/arm/mach-davinci/board-neuros-osd2.c
	arch/arm/mach-davinci/board-sffsdr.c

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2012-03-15 20:33:47 +00:00
..
boot Merge tag 'tegra-soc-drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/olof/tegra into tegra/soc-drivers 2012-03-04 21:03:30 +00:00
common Merge branch 'depends/irqdomain' into next/drivers 2012-03-05 16:58:11 +00:00
configs Merge branch 'lpc32xx/drivers' into next/drivers 2012-03-15 14:48:42 +00:00
include/asm Merge branch 'next/cleanup-use-static' into next/cleanup-exynos-clock 2012-03-10 22:21:36 -08:00
kernel Merge branch 'next/cleanup-use-static' into next/cleanup-exynos-clock 2012-03-10 22:21:36 -08:00
lib ARM: 7301/1: Rename the T() macro to TUSER() to avoid namespace conflicts 2012-01-25 11:07:40 +00:00
mach-at91 Merge branch 'next/cleanup-use-static' into next/cleanup-exynos-clock 2012-03-10 22:21:36 -08:00
mach-bcmring Merge branch 'next/cleanup-use-static' into next/cleanup-exynos-clock 2012-03-10 22:21:36 -08:00
mach-clps711x ARM: big removal of now unused arch_idle() 2012-01-20 19:25:58 -05:00
mach-cns3xxx ARM: big removal of now unused arch_idle() 2012-01-20 19:25:58 -05:00
mach-davinci Merge branch 'v3.4/features' of git://gitorious.org/linux-davinci/linux-davinci into next/drivers 2012-03-15 20:33:47 +00:00
mach-dove Merge branch 'next/cleanup-use-static' into next/cleanup-exynos-clock 2012-03-10 22:21:36 -08:00
mach-ebsa110 ARM: big removal of now unused arch_idle() 2012-01-20 19:25:58 -05:00
mach-ep93xx Merge branch 'next/cleanup-use-static' into next/cleanup-exynos-clock 2012-03-10 22:21:36 -08:00
mach-exynos Merge branch 'next/devel-samsung-pd' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/drivers 2012-03-13 16:51:07 -07:00
mach-footbridge ARM: big removal of now unused arch_idle() 2012-01-20 19:25:58 -05:00
mach-gemini ARM: big removal of now unused arch_idle() 2012-01-20 19:25:58 -05:00
mach-h720x ARM: big removal of now unused arch_idle() 2012-01-20 19:25:58 -05:00
mach-highbank Linux 3.3-rc2 2012-02-07 15:05:20 -08:00
mach-imx Merge branch 'depends/irqdomain' into next/drivers 2012-03-05 16:58:11 +00:00
mach-integrator Merge branch 'amba' into for-armsoc 2012-01-26 19:59:44 +00:00
mach-iop13xx ARM: big removal of now unused arch_idle() 2012-01-20 19:25:58 -05:00
mach-iop32x ARM: big removal of now unused arch_idle() 2012-01-20 19:25:58 -05:00
mach-iop33x ARM: big removal of now unused arch_idle() 2012-01-20 19:25:58 -05:00
mach-ixp4xx ARM: big removal of now unused arch_idle() 2012-01-20 19:25:58 -05:00
mach-ixp23xx ARM: big removal of now unused arch_idle() 2012-01-20 19:25:58 -05:00
mach-ixp2000 ARM: big removal of now unused arch_idle() 2012-01-20 19:25:58 -05:00
mach-kirkwood Merge branch 'next/cleanup-use-static' into next/cleanup-exynos-clock 2012-03-10 22:21:36 -08:00
mach-ks8695 ARM: big removal of now unused arch_idle() 2012-01-20 19:25:58 -05:00
mach-l7200/include/mach
mach-lpc32xx Merge branch 'lpc32xx/drivers' into next/drivers 2012-03-15 14:48:42 +00:00
mach-mmp Merge branch 'next/cleanup-use-static' into next/cleanup-exynos-clock 2012-03-10 22:21:36 -08:00
mach-msm Merge branch 'depends/irqdomain' into next/drivers 2012-03-05 16:58:11 +00:00
mach-mv78xx0 Merge branch 'next/cleanup-use-static' into next/cleanup-exynos-clock 2012-03-10 22:21:36 -08:00
mach-mxs Merge branch 'mxs/gpmi' of git://git.linaro.org/people/shawnguo/linux-2.6 into next/drivers 2012-02-28 12:21:17 +00:00
mach-netx Merge branch 'amba' into for-armsoc 2012-01-26 19:59:44 +00:00
mach-nomadik Merge branch 'amba' into for-armsoc 2012-01-26 19:59:44 +00:00
mach-omap1 Merge branch 'next/cleanup-use-static' into next/cleanup-exynos-clock 2012-03-10 22:21:36 -08:00
mach-omap2 Merge branch 'next/cleanup-use-static' into next/cleanup-exynos-clock 2012-03-10 22:21:36 -08:00
mach-orion5x Merge branch 'next/cleanup-use-static' into next/cleanup-exynos-clock 2012-03-10 22:21:36 -08:00
mach-picoxcell ARM: big removal of now unused arch_idle() 2012-01-20 19:25:58 -05:00
mach-pnx4008 ARM: big removal of now unused arch_idle() 2012-01-20 19:25:58 -05:00
mach-prima2 Merge branch 'depends/irqdomain' into next/drivers 2012-03-05 16:58:11 +00:00
mach-pxa Merge branch 'next/cleanup-use-static' into next/cleanup-exynos-clock 2012-03-10 22:21:36 -08:00
mach-realview Linux 3.3-rc2 2012-02-07 15:05:20 -08:00
mach-rpc ARM: big removal of now unused arch_idle() 2012-01-20 19:25:58 -05:00
mach-s3c64xx Merge branch 'next/cleanup-use-static' into next/cleanup-exynos-clock 2012-03-10 22:21:36 -08:00
mach-s3c2410 Merge branch 'next/cleanup-use-static' into next/cleanup-exynos-clock 2012-03-10 22:21:36 -08:00
mach-s3c2412 Merge branch 'next/cleanup-use-static' into next/cleanup-exynos-clock 2012-03-10 22:21:36 -08:00
mach-s3c2416 Merge branch 'next/devel-samsung-dma' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/drivers 2012-03-13 16:22:20 -07:00
mach-s3c2440 Merge branch 'next/cleanup-use-static' into next/cleanup-exynos-clock 2012-03-10 22:21:36 -08:00
mach-s3c2443 Merge branch 'lpc32xx/drivers' into next/drivers 2012-02-22 14:20:18 +00:00
mach-s5p64x0 Merge branch 'next/cleanup-use-static' into next/cleanup-exynos-clock 2012-03-10 22:21:36 -08:00
mach-s5pc100 Merge branch 'topic/cleanup-use-static' into next/cleanup-use-static 2012-03-07 03:34:41 -08:00
mach-s5pv210 Merge branch 'next/cleanup-use-static' into next/cleanup-exynos-clock 2012-03-10 22:21:36 -08:00
mach-sa1100 Merge branch 'rtc-sa1100' of git://github.com/hzhuang1/linux into next/drivers 2012-02-28 12:38:46 +00:00
mach-shark ARM: big removal of now unused arch_idle() 2012-01-20 19:25:58 -05:00
mach-shmobile Merge branch 'next/cleanup-use-static' into next/cleanup-exynos-clock 2012-03-10 22:21:36 -08:00
mach-spear3xx Merge branch 'amba' into for-armsoc 2012-01-26 19:59:44 +00:00
mach-spear6xx Merge branch 'amba' into for-armsoc 2012-01-26 19:59:44 +00:00
mach-tegra Merge branch 'next/cleanup-use-static' into next/cleanup-exynos-clock 2012-03-10 22:21:36 -08:00
mach-u300 Merge branch 'amba' into for-armsoc 2012-01-26 19:59:44 +00:00
mach-ux500 Linux 3.3-rc2 2012-02-07 15:05:20 -08:00
mach-versatile Merge branch 'depends/irqdomain' into next/drivers 2012-03-05 16:58:11 +00:00
mach-vexpress Linux 3.3-rc2 2012-02-07 15:05:20 -08:00
mach-vt8500 ARM: big removal of now unused arch_idle() 2012-01-20 19:25:58 -05:00
mach-w90x900 ARM: big removal of now unused arch_idle() 2012-01-20 19:25:58 -05:00
mach-zynq ARM: big removal of now unused arch_idle() 2012-01-20 19:25:58 -05:00
mm ARM: 7325/1: fix v7 boot with lockdep enabled 2012-02-15 21:09:52 +00:00
nwfpe ARM: 7207/1: Use generic ARM instruction set condition code checks for nwfpe. 2011-12-13 08:52:02 +00:00
oprofile oprofile, arm/sh: Fix oprofile_arch_exit() linkage issue 2011-12-23 11:58:34 +01:00
plat-iop Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci 2012-01-11 18:50:26 -08:00
plat-mxc Merge branch 'imx/driver' of git://git.linaro.org/people/shawnguo/linux-2.6 into next/drivers 2012-02-28 12:23:27 +00:00
plat-nomadik Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma 2012-01-17 18:40:24 -08:00
plat-omap Merge branch 'next/cleanup-use-static' into next/cleanup-exynos-clock 2012-03-10 22:21:36 -08:00
plat-orion ARM: orion: Fix USB phy for orion5x. 2012-02-09 16:16:35 -08:00
plat-pxa Merge branches 'drivers/macb-gem' and 'drivers/pxa-gpio' into next/drivers 2011-11-23 20:47:41 +00:00
plat-s3c24xx Merge branch 'topic/cleanup-use-static' into next/cleanup-use-static 2012-03-07 03:34:41 -08:00
plat-s5p ARM: SAMSUNG: use static declaration when it is not used in other files 2012-01-21 13:06:18 +09:00
plat-samsung Merge branch 'next/devel-samsung-dma' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/drivers 2012-03-13 16:22:20 -07:00
plat-spear ARM: big removal of now unused arch_idle() 2012-01-20 19:25:58 -05:00
plat-versatile ARM: 7293/1: logical_cpu_map: decouple CPU mapping from SMP 2012-01-23 10:20:05 +00:00
tools ARM: Update mach-types 2011-12-23 22:58:10 +00:00
vfp
Kconfig Merge branch 'rtc-sa1100' of git://github.com/hzhuang1/linux into next/drivers 2012-02-28 12:38:46 +00:00
Kconfig-nommu
Kconfig.debug Merge branch 'imx/driver' of git://git.linaro.org/people/shawnguo/linux-2.6 into next/drivers 2012-02-28 12:23:27 +00:00
Makefile Consolidate i.MX 5 platforms to be under the new shared i.MX 3/5/6 tree. 2012-01-23 14:50:30 -08:00