]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 5c07228 ad4522a)
Merge branch 'depends/rmk/restart' into next/cleanup
authorArnd Bergmann <arnd@arndb.de>
Sat, 7 Jan 2012 11:51:28 +0000 (11:51 +0000)
committerArnd Bergmann <arnd@arndb.de>
Sat, 7 Jan 2012 11:51:28 +0000 (11:51 +0000)
commit54ed96faf70c9ee73e4109db4fd0573d4ddddcdb
tree17a3216542d1107f777fd82577c91aebbce597d6tree | snapshot
parent5c07228674847da3a89faca5ee642afc54e35861commit | diff
parentad4522a5cdff8c2c4a68c68978c72eb8ccc47e5dcommit | diff
Merge branch 'depends/rmk/restart' into next/cleanup

Conflicts:
arch/arm/mach-at91/at91cap9.c
arch/arm/mach-at91/at91sam9260.c
arch/arm/mach-at91/at91sam9261.c
arch/arm/mach-at91/at91sam9263.c
arch/arm/mach-at91/at91sam9g45.c
arch/arm/mach-at91/at91sam9rl.c
arch/arm/mach-exynos/cpu.c
arch/arm/mach-shmobile/board-kota2.c

This resolves a bunch of conflicts between the arm-soc tree
and changes from the arm tree that have gone upstream.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
104 files changed:
MAINTAINERS diff1 | diff2 | blob | history
arch/arm/Kconfig diff1 | diff2 | blob | history
arch/arm/include/asm/system.h diff1 | diff2 | blob | history
arch/arm/kernel/perf_event.c diff1 | diff2 | blob | history
arch/arm/kernel/process.c diff1 | diff2 | blob | history
arch/arm/kernel/setup.c diff1 | diff2 | blob | history
arch/arm/mach-at91/at91cap9.c diff1 | diff2 | blob | history
arch/arm/mach-at91/at91rm9200.c diff1 | diff2 | blob | history
arch/arm/mach-at91/at91sam9260.c diff1 | diff2 | blob | history
arch/arm/mach-at91/at91sam9261.c diff1 | diff2 | blob | history
arch/arm/mach-at91/at91sam9263.c diff1 | diff2 | blob | history
arch/arm/mach-at91/at91sam9g45.c diff1 | diff2 | blob | history
arch/arm/mach-at91/at91sam9rl.c diff1 | diff2 | blob | history
arch/arm/mach-at91/generic.h diff1 | diff2 | blob | history
arch/arm/mach-cns3xxx/cns3420vb.c diff1 | diff2 | blob | history
arch/arm/mach-ep93xx/adssphere.c diff1 | diff2 | blob | history
arch/arm/mach-ep93xx/edb93xx.c diff1 | diff2 | blob | history
arch/arm/mach-ep93xx/gesbc9312.c diff1 | diff2 | blob | history
arch/arm/mach-ep93xx/micro9.c diff1 | diff2 | blob | history
arch/arm/mach-ep93xx/simone.c diff1 | diff2 | blob | history
arch/arm/mach-ep93xx/snappercl15.c diff1 | diff2 | blob | history
arch/arm/mach-ep93xx/ts72xx.c diff1 | diff2 | blob | history
arch/arm/mach-exynos/common.c | diff2 | blob | history
arch/arm/mach-exynos/mach-armlex4210.c diff1 | diff2 | blob | history
arch/arm/mach-exynos/mach-nuri.c diff1 | diff2 | blob | history
arch/arm/mach-exynos/mach-origen.c diff1 | diff2 | blob | history
arch/arm/mach-exynos/mach-smdk4x12.c diff1 | diff2 | blob | history
arch/arm/mach-exynos/mach-smdkv310.c diff1 | diff2 | blob | history
arch/arm/mach-exynos/mach-universal_c210.c diff1 | diff2 | blob | history
arch/arm/mach-highbank/highbank.c diff1 | diff2 | blob | history
arch/arm/mach-netx/nxdb500.c diff1 | diff2 | blob | history
arch/arm/mach-netx/nxdkn.c diff1 | diff2 | blob | history
arch/arm/mach-netx/nxeb500hmi.c diff1 | diff2 | blob | history
arch/arm/mach-nomadik/board-nhk8815.c diff1 | diff2 | blob | history
arch/arm/mach-omap2/board-2430sdp.c diff1 | diff2 | blob | history
arch/arm/mach-omap2/board-3430sdp.c diff1 | diff2 | blob | history
arch/arm/mach-omap2/board-3630sdp.c diff1 | diff2 | blob | history
arch/arm/mach-omap2/board-4430sdp.c diff1 | diff2 | blob | history
arch/arm/mach-omap2/board-am3517crane.c diff1 | diff2 | blob | history
arch/arm/mach-omap2/board-am3517evm.c diff1 | diff2 | blob | history
arch/arm/mach-omap2/board-apollon.c diff1 | diff2 | blob | history
arch/arm/mach-omap2/board-cm-t35.c diff1 | diff2 | blob | history
arch/arm/mach-omap2/board-cm-t3517.c diff1 | diff2 | blob | history
arch/arm/mach-omap2/board-devkit8000.c diff1 | diff2 | blob | history
arch/arm/mach-omap2/board-generic.c diff1 | diff2 | blob | history
arch/arm/mach-omap2/board-h4.c diff1 | diff2 | blob | history
arch/arm/mach-omap2/board-igep0020.c diff1 | diff2 | blob | history
arch/arm/mach-omap2/board-ldp.c diff1 | diff2 | blob | history
arch/arm/mach-omap2/board-n8x0.c diff1 | diff2 | blob | history
arch/arm/mach-omap2/board-omap3beagle.c diff1 | diff2 | blob | history
arch/arm/mach-omap2/board-omap3evm.c diff1 | diff2 | blob | history
arch/arm/mach-omap2/board-omap3logic.c diff1 | diff2 | blob | history
arch/arm/mach-omap2/board-omap3pandora.c diff1 | diff2 | blob | history
arch/arm/mach-omap2/board-omap3stalker.c diff1 | diff2 | blob | history
arch/arm/mach-omap2/board-omap3touchbook.c diff1 | diff2 | blob | history
arch/arm/mach-omap2/board-omap4panda.c diff1 | diff2 | blob | history
arch/arm/mach-omap2/board-overo.c diff1 | diff2 | blob | history
arch/arm/mach-omap2/board-rm680.c diff1 | diff2 | blob | history
arch/arm/mach-omap2/board-rx51.c diff1 | diff2 | blob | history
arch/arm/mach-omap2/board-zoom.c diff1 | diff2 | blob | history
arch/arm/mach-omap2/common.h diff1 | diff2 | blob | history
arch/arm/mach-realview/realview_eb.c diff1 | diff2 | blob | history
arch/arm/mach-realview/realview_pb1176.c diff1 | diff2 | blob | history
arch/arm/mach-realview/realview_pb11mp.c diff1 | diff2 | blob | history
arch/arm/mach-realview/realview_pba8.c diff1 | diff2 | blob | history
arch/arm/mach-realview/realview_pbx.c diff1 | diff2 | blob | history
arch/arm/mach-s3c64xx/mach-anw6410.c diff1 | diff2 | blob | history
arch/arm/mach-s3c64xx/mach-crag6410.c diff1 | diff2 | blob | history
arch/arm/mach-s3c64xx/mach-hmt.c diff1 | diff2 | blob | history
arch/arm/mach-s3c64xx/mach-mini6410.c diff1 | diff2 | blob | history
arch/arm/mach-s3c64xx/mach-ncp.c diff1 | diff2 | blob | history
arch/arm/mach-s3c64xx/mach-real6410.c diff1 | diff2 | blob | history
arch/arm/mach-s3c64xx/mach-smartq5.c diff1 | diff2 | blob | history
arch/arm/mach-s3c64xx/mach-smartq7.c diff1 | diff2 | blob | history
arch/arm/mach-s3c64xx/mach-smdk6400.c diff1 | diff2 | blob | history
arch/arm/mach-s3c64xx/mach-smdk6410.c diff1 | diff2 | blob | history
arch/arm/mach-s5p64x0/mach-smdk6440.c diff1 | diff2 | blob | history
arch/arm/mach-s5p64x0/mach-smdk6450.c diff1 | diff2 | blob | history
arch/arm/mach-s5pc100/mach-smdkc100.c diff1 | diff2 | blob | history
arch/arm/mach-s5pv210/mach-aquila.c diff1 | diff2 | blob | history
arch/arm/mach-s5pv210/mach-goni.c diff1 | diff2 | blob | history
arch/arm/mach-s5pv210/mach-smdkc110.c diff1 | diff2 | blob | history
arch/arm/mach-s5pv210/mach-smdkv210.c diff1 | diff2 | blob | history
arch/arm/mach-s5pv210/mach-torbreck.c diff1 | diff2 | blob | history
arch/arm/mach-shmobile/board-ag5evm.c diff1 | diff2 | blob | history
arch/arm/mach-shmobile/board-kota2.c diff1 | diff2 | blob | history
arch/arm/mach-spear3xx/spear300_evb.c diff1 | diff2 | blob | history
arch/arm/mach-spear3xx/spear310_evb.c diff1 | diff2 | blob | history
arch/arm/mach-spear3xx/spear320_evb.c diff1 | diff2 | blob | history
arch/arm/mach-spear6xx/spear600_evb.c diff1 | diff2 | blob | history
arch/arm/mach-tegra/board-dt.c diff1 | diff2 | blob | history
arch/arm/mach-tegra/board-harmony.c diff1 | diff2 | blob | history
arch/arm/mach-tegra/board-paz00.c diff1 | diff2 | blob | history
arch/arm/mach-tegra/board-seaboard.c diff1 | diff2 | blob | history
arch/arm/mach-tegra/board-trimslice.c diff1 | diff2 | blob | history
arch/arm/mach-u300/u300.c diff1 | diff2 | blob | history
arch/arm/mach-versatile/core.c diff1 | diff2 | blob | history
arch/arm/mach-versatile/versatile_ab.c diff1 | diff2 | blob | history
arch/arm/mach-versatile/versatile_dt.c diff1 | diff2 | blob | history
arch/arm/mach-versatile/versatile_pb.c diff1 | diff2 | blob | history
arch/arm/mach-vexpress/v2m.c diff1 | diff2 | blob | history
arch/arm/plat-iop/Makefile diff1 | diff2 | blob | history
arch/arm/plat-mxc/include/mach/common.h diff1 | diff2 | blob | history
mm/vmalloc.c diff1 | diff2 | blob | history
Linux Kernel Source Tree.