AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity
e067096c8d
kernel_optimize_test/arch/arm
History
Arnd Bergmann e067096c8d Merge branch 'tegra/soc' into next/boards 
Conflicts:
	arch/arm/mach-tegra/board-harmony-pcie.c

To fix an internal merge conflict between the tegra/soc and tegra/boards
branches.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2012-01-06 23:09:14 +00:00
..
boot Merge branch 'tegra/soc' into next/boards 2012-01-06 23:09:14 +00:00
common ARM: 7183/1: vic: register the VIC for ST-modified VIC's 2011-12-11 09:56:57 +00:00
configs Merge branch 'tegra/soc' into next/boards 2012-01-06 23:09:14 +00:00
include/asm Merge branch 'imx/board' into next/boards 2012-01-03 21:22:46 +00:00
kernel Merge branch 'imx/board' into next/boards 2012-01-03 21:22:46 +00:00
lib ARM: lib: add call_with_stack function for safely changing stack 2011-12-12 16:07:35 +00:00
mach-at91 Merge branch 'depends/rmk/devel-stable' into next/boards 2011-12-16 14:50:01 -08:00
mach-bcmring Merge branch 'vmalloc' of git://git.linaro.org/people/nico/linux into devel-stable 2011-12-05 23:27:59 +00:00
mach-clps711x Merge branch 'vmalloc' of git://git.linaro.org/people/nico/linux into devel-stable 2011-12-05 23:27:59 +00:00
mach-cns3xxx Merge branch 'vmalloc' of git://git.linaro.org/people/nico/linux into devel-stable 2011-12-05 23:27:59 +00:00
mach-davinci Merge branch 'depends/rmk/devel-stable' into next/boards 2011-12-16 14:50:01 -08:00
mach-dove ARM: big removal of now unused vmalloc.h files 2011-11-26 19:21:29 -05:00
mach-ebsa110 Merge branch 'vmalloc' of git://git.linaro.org/people/nico/linux into devel-stable 2011-12-05 23:27:59 +00:00
mach-ep93xx Merge branch 'vmalloc' of git://git.linaro.org/people/nico/linux into devel-stable 2011-12-05 23:27:59 +00:00
mach-exynos Merge branch 'imx/board' into next/boards 2012-01-03 21:22:46 +00:00
mach-footbridge Merge branch 'vmalloc' of git://git.linaro.org/people/nico/linux into devel-stable 2011-12-05 23:27:59 +00:00
mach-gemini ARM: big removal of now unused vmalloc.h files 2011-11-26 19:21:29 -05:00
mach-h720x ARM: big removal of now unused vmalloc.h files 2011-11-26 19:21:29 -05:00
mach-highbank Merge branch 'vmalloc' of git://git.linaro.org/people/nico/linux into devel-stable 2011-12-05 23:27:59 +00:00
mach-imx Merge branch 'imx/board' into next/boards 2012-01-03 21:22:46 +00:00
mach-integrator ARM: big removal of now unused vmalloc.h files 2011-11-26 19:21:29 -05:00
mach-iop13xx ARM: big removal of now unused vmalloc.h files 2011-11-26 19:21:29 -05:00
mach-iop32x Merge branch 'vmalloc' of git://git.linaro.org/people/nico/linux into devel-stable 2011-12-05 23:27:59 +00:00
mach-iop33x Merge branch 'vmalloc' of git://git.linaro.org/people/nico/linux into devel-stable 2011-12-05 23:27:59 +00:00
mach-ixp4xx Merge branch 'vmalloc' of git://git.linaro.org/people/nico/linux into devel-stable 2011-12-05 23:27:59 +00:00
mach-ixp23xx ARM: big removal of now unused vmalloc.h files 2011-11-26 19:21:29 -05:00
mach-ixp2000 Merge branch 'vmalloc' of git://git.linaro.org/people/nico/linux into devel-stable 2011-12-05 23:27:59 +00:00
mach-kirkwood ARM: big removal of now unused vmalloc.h files 2011-11-26 19:21:29 -05:00
mach-ks8695 Merge branch 'vmalloc' of git://git.linaro.org/people/nico/linux into devel-stable 2011-12-05 23:27:59 +00:00
mach-l7200/include/mach
mach-lpc32xx Merge branch 'vmalloc' of git://git.linaro.org/people/nico/linux into devel-stable 2011-12-05 23:27:59 +00:00
mach-mmp Merge branch 'vmalloc' of git://git.linaro.org/people/nico/linux into devel-stable 2011-12-05 23:27:59 +00:00
mach-msm Merge branch 'depends/rmk/devel-stable' into next/boards 2011-12-16 14:50:01 -08:00
mach-mv78xx0 ARM: big removal of now unused vmalloc.h files 2011-11-26 19:21:29 -05:00
mach-mx5 Merge branch 'imx-fixes-for-arnd' of git://git.pengutronix.de/git/imx/linux-2.6 into fixes 2011-12-13 16:34:25 +00:00
mach-mxs Merge branch 'depends/rmk/devel-stable' into next/boards 2011-12-16 14:50:01 -08:00
mach-netx Merge branch 'vmalloc' of git://git.linaro.org/people/nico/linux into devel-stable 2011-12-05 23:27:59 +00:00
mach-nomadik Merge branch 'vmalloc' of git://git.linaro.org/people/nico/linux into devel-stable 2011-12-05 23:27:59 +00:00
mach-omap1 Merge branch 'depends/rmk/devel-stable' into next/boards 2011-12-16 14:50:01 -08:00
mach-omap2 Merge branch 'imx/board' into next/boards 2012-01-03 21:22:46 +00:00
mach-orion5x ARM: big removal of now unused vmalloc.h files 2011-11-26 19:21:29 -05:00
mach-picoxcell Merge branch 'vmalloc' of git://git.linaro.org/people/nico/linux into devel-stable 2011-12-05 23:27:59 +00:00
mach-pnx4008 Merge branch 'vmalloc' of git://git.linaro.org/people/nico/linux into devel-stable 2011-12-05 23:27:59 +00:00
mach-prima2 Merge branch 'depends/rmk/devel-stable' into next/boards 2011-12-16 14:50:01 -08:00
mach-pxa Merge branch 'pxa/board' into next/boards 2011-12-28 10:47:00 +00:00
mach-realview Merge branch 'vmalloc' of git://git.linaro.org/people/nico/linux into devel-stable 2011-12-05 23:27:59 +00:00
mach-rpc Merge branch 'vmalloc' of git://git.linaro.org/people/nico/linux into devel-stable 2011-12-05 23:27:59 +00:00
mach-s3c64xx Merge branch 'samsung/board' into next/boards 2011-12-16 14:56:37 -08:00
mach-s3c2410 Merge branch 'vmalloc' of git://git.linaro.org/people/nico/linux into devel-stable 2011-12-05 23:27:59 +00:00
mach-s3c2412 Merge branch 'next/cleanup3' of git://git.linaro.org/people/arnd/arm-soc 2011-11-05 18:18:05 -07:00
mach-s3c2416 Merge branch 'next/devel2' of git://git.linaro.org/people/arnd/arm-soc 2011-11-05 18:21:21 -07:00
mach-s3c2440 ARM: S3C2440: Add new LCD (W35i) support for Mini2440 board 2011-12-06 20:21:54 +09:00
mach-s3c2443 Merge branch 'next/devel2' of git://git.linaro.org/people/arnd/arm-soc 2011-11-05 18:21:21 -07:00
mach-s5p64x0 Merge branch 'vmalloc' of git://git.linaro.org/people/nico/linux into devel-stable 2011-12-05 23:27:59 +00:00
mach-s5pc100 Merge branch 'vmalloc' of git://git.linaro.org/people/nico/linux into devel-stable 2011-12-05 23:27:59 +00:00
mach-s5pv210 Merge branch 'imx/board' into next/boards 2012-01-03 21:22:46 +00:00
mach-sa1100 Merge branch 'depends/rmk/devel-stable' into next/boards 2011-12-16 14:50:01 -08:00
mach-shark Merge branch 'vmalloc' of git://git.linaro.org/people/nico/linux into devel-stable 2011-12-05 23:27:59 +00:00
mach-shmobile Merge branch 'vmalloc' of git://git.linaro.org/people/nico/linux into devel-stable 2011-12-05 23:27:59 +00:00
mach-spear3xx Merge branch 'vmalloc' of git://git.linaro.org/people/nico/linux into devel-stable 2011-12-05 23:27:59 +00:00
mach-spear6xx Merge branch 'vmalloc' of git://git.linaro.org/people/nico/linux into devel-stable 2011-12-05 23:27:59 +00:00
mach-tcc8k Merge branch 'devel-stable' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm 2011-10-28 12:02:27 -07:00
mach-tegra Merge branch 'tegra/soc' into next/boards 2012-01-06 23:09:14 +00:00
mach-u300 Merge branch 'vmalloc' of git://git.linaro.org/people/nico/linux into devel-stable 2011-12-05 23:27:59 +00:00
mach-ux500 Merge branch 'vmalloc' of git://git.linaro.org/people/nico/linux into devel-stable 2011-12-05 23:27:59 +00:00
mach-versatile Merge branch 'vmalloc' of git://git.linaro.org/people/nico/linux into devel-stable 2011-12-05 23:27:59 +00:00
mach-vexpress Merge branch 'vmalloc' of git://git.linaro.org/people/nico/linux into devel-stable 2011-12-05 23:27:59 +00:00
mach-vt8500 ARM: big removal of now unused vmalloc.h files 2011-11-26 19:21:29 -05:00
mach-w90x900 Merge branch 'vmalloc' of git://git.linaro.org/people/nico/linux into devel-stable 2011-12-05 23:27:59 +00:00
mach-zynq Merge branch 'vmalloc' of git://git.linaro.org/people/nico/linux into devel-stable 2011-12-05 23:27:59 +00:00
mm Merge branch 'for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/cmarinas/linux into devel-stable 2011-12-08 18:02:04 +00:00
nwfpe
oprofile
plat-iop ARM: plat-iop: remove arch specific special handling for ioremap 2011-11-18 13:51:18 -05:00
plat-mxc Merge branch 'imx/board' into next/boards 2012-01-03 21:22:46 +00:00
plat-nomadik Merge branch 'next/timer' of git://git.linaro.org/people/arnd/arm-soc 2011-11-01 20:18:05 -07:00
plat-omap ARM: OMAP: musb: Add ti81xx phy power function 2011-12-13 10:50:58 -08:00
plat-orion
plat-pxa Merge git://git.infradead.org/mtd-2.6 2011-11-07 09:11:16 -08:00
plat-s3c24xx ARM: SAMSUNG: inclusion export.h instead of module.h 2011-11-17 01:14:38 +09:00
plat-s5p Merge branch 'for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/will/linux into devel-stable 2011-12-05 23:20:17 +00:00
plat-samsung Merge branch 'imx/board' into next/boards 2012-01-03 21:22:46 +00:00
plat-spear Merge branch 'vmalloc' of git://git.linaro.org/people/nico/linux into devel-stable 2011-12-05 23:27:59 +00:00
plat-tcc ARM: big removal of now unused vmalloc.h files 2011-11-26 19:21:29 -05:00
plat-versatile
tools ARM: Update mach-types to fix mxs build breakage 2011-11-17 07:49:17 +08:00
vfp arm: remove several unnecessary module.h include instances 2011-10-31 19:30:48 -04:00
Kconfig Merge branch 'imx/board' into next/boards 2012-01-03 21:22:46 +00:00
Kconfig-nommu
Kconfig.debug Merge branch 'next/soc' of git://git.linaro.org/people/arnd/arm-soc 2011-11-01 21:08:03 -07:00
Makefile ARM: EXYNOS: Add ARCH_EXYNOS and reorganize arch/arm/mach-exynos 2011-11-06 13:54:56 +09:00