FEX-Emu/linux
1
0
Fork 0
mirror of https://github.com/FEX-Emu/linux.git synced 2024-12-29 13:00:35 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
a3a3c46641
linux/arch/arm
History
Arnd Bergmann a3a3c46641 Merge branch 'davinci/cleanups' into next/cleanup 
* davinci/cleanups:
  ARM: davinci: add back dummy header files
  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
2012-02-27 14:58:53 +00:00
..
boot Merge branch 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild 2012-01-16 14:34:54 -08:00
common ARM: 7293/1: logical_cpu_map: decouple CPU mapping from SMP 2012-01-23 10:20:05 +00:00
configs ARM: at91: code removal of CAP9 SoC 2012-02-03 13:33:05 +01:00
include/asm Merge branch 'imx-cleanup' of git://git.pengutronix.de/git/imx/linux-2.6 into next/cleanup 2012-02-27 13:40:49 +00:00
kernel Merge branch 'imx-cleanup' of git://git.pengutronix.de/git/imx/linux-2.6 into next/cleanup 2012-02-27 13:40:49 +00: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 ARM: at91: implement the standby function for pm/cpuidle 2012-02-03 13:42:19 +01:00
mach-bcmring Merge branch 'imx-cleanup' of git://git.pengutronix.de/git/imx/linux-2.6 into next/cleanup 2012-02-27 13:40:49 +00: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 'davinci/cleanups' into next/cleanup 2012-02-27 14:58:53 +00:00
mach-dove ARM: big removal of now unused arch_idle() 2012-01-20 19:25:58 -05:00
mach-ebsa110 ARM: big removal of now unused arch_idle() 2012-01-20 19:25:58 -05:00
mach-ep93xx Merge branch 'amba' into for-armsoc 2012-01-26 19:59:44 +00:00
mach-exynos Merge remote-tracking branch 'armsoc/depends/rmk/for-armsoc' into at91-3.4-base 2012-02-03 12:32:26 +01: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 Merge remote-tracking branch 'armsoc/depends/rmk/for-armsoc' into at91-3.4-base 2012-02-03 12:32:26 +01:00
mach-imx Merge branch 'imx-cleanup' of git://git.pengutronix.de/git/imx/linux-2.6 into next/cleanup 2012-02-27 13:40:49 +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 ARM: big removal of now unused arch_idle() 2012-01-20 19:25:58 -05: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 'amba' into for-armsoc 2012-01-26 19:59:44 +00:00
mach-mmp ARM: big removal of now unused arch_idle() 2012-01-20 19:25:58 -05:00
mach-msm Merge remote-tracking branch 'armsoc/depends/rmk/for-armsoc' into at91-3.4-base 2012-02-03 12:32:26 +01:00
mach-mv78xx0 ARM: big removal of now unused arch_idle() 2012-01-20 19:25:58 -05:00
mach-mxs Merge branch 'amba' into for-armsoc 2012-01-26 19:59:44 +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 ARM: big removal of now unused arch_idle() 2012-01-20 19:25:58 -05:00
mach-omap2 Merge branch 'imx-cleanup' of git://git.pengutronix.de/git/imx/linux-2.6 into next/cleanup 2012-02-27 13:40:49 +00:00
mach-orion5x ARM: big removal of now unused arch_idle() 2012-01-20 19:25:58 -05: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 ARM: big removal of now unused arch_idle() 2012-01-20 19:25:58 -05:00
mach-pxa Merge remote-tracking branch 'armsoc/depends/rmk/for-armsoc' into at91-3.4-base 2012-02-03 12:32:26 +01:00
mach-realview Merge remote-tracking branch 'armsoc/depends/rmk/for-armsoc' into at91-3.4-base 2012-02-03 12:32:26 +01:00
mach-rpc ARM: big removal of now unused arch_idle() 2012-01-20 19:25:58 -05:00
mach-s3c64xx ARM: big removal of now unused arch_idle() 2012-01-20 19:25:58 -05:00
mach-s3c2410 ARM: big removal of now unused arch_idle() 2012-01-20 19:25:58 -05:00
mach-s3c2412 ARM: s3c24xx: move special idle code to out of line 2012-01-20 18:55:13 -05:00
mach-s3c2416 ARM: s3c24xx: move special idle code to out of line 2012-01-20 18:55:13 -05:00
mach-s3c2440
mach-s3c2443
mach-s5p64x0 Merge branch 'amba' into for-armsoc 2012-01-26 19:59:44 +00:00
mach-s5pc100 Merge branch 'amba' into for-armsoc 2012-01-26 19:59:44 +00:00
mach-s5pv210 Merge branch 'amba' into for-armsoc 2012-01-26 19:59:44 +00:00
mach-sa1100 Merge remote-tracking branch 'armsoc/depends/rmk/for-armsoc' into at91-3.4-base 2012-02-03 12:32:26 +01:00
mach-shark ARM: big removal of now unused arch_idle() 2012-01-20 19:25:58 -05:00
mach-shmobile Merge branch 'imx-cleanup' of git://git.pengutronix.de/git/imx/linux-2.6 into next/cleanup 2012-02-27 13:40:49 +00: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 ARM: big removal of now unused arch_idle() 2012-01-20 19:25:58 -05:00
mach-u300 Merge branch 'amba' into for-armsoc 2012-01-26 19:59:44 +00:00
mach-ux500 Merge remote-tracking branch 'armsoc/depends/rmk/for-armsoc' into at91-3.4-base 2012-02-03 12:32:26 +01:00
mach-versatile Merge branch 'amba' into for-armsoc 2012-01-26 19:59:44 +00:00
mach-vexpress Merge remote-tracking branch 'armsoc/depends/rmk/for-armsoc' into at91-3.4-base 2012-02-03 12:32:26 +01: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 Revert "ARM: 7304/1: ioremap: fix boundary check when reusing static mapping" 2012-02-02 17:37:41 +00:00
nwfpe
oprofile
plat-iop
plat-mxc Merge branch 'imx-cleanup' of git://git.pengutronix.de/git/imx/linux-2.6 into next/cleanup 2012-02-27 13:40:49 +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 ARM: big removal of now unused arch_idle() 2012-01-20 19:25:58 -05:00
plat-orion
plat-pxa
plat-s3c24xx ARM: s3c24xx: move special idle code to out of line 2012-01-20 18:55:13 -05:00
plat-s5p
plat-samsung ARM: fixes for ARM platforms 2012-01-17 18:55:56 -08: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
vfp
Kconfig ARM: at91: code removal of CAP9 SoC 2012-02-03 13:33:05 +01:00
Kconfig-nommu
Kconfig.debug ARM: at91: code removal of CAP9 SoC 2012-02-03 13:33:05 +01: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