apfs/linux-apfs
0
0
Fork 0
mirror of https://github.com/linux-apfs/linux-apfs.git synced 2026-05-01 15:00:59 -07:00
Code Issues Packages Projects Releases Wiki Activity
Files
a7fadac10ffbfd16cc7ccf951eab1ecf85e1abdf
linux-apfs/arch/arm/mach-versatile
T
History
Arnd Bergmann a7fadac10f Merge branch 'depends/rmk/devel-stable' into next/board 
The exynos4 updates conflict with code from the arm devel-stable branch
and new boards need to set atag_offset in place of boot_param.

Conflicts:
	arch/arm/Kconfig
	arch/arm/mach-exynos4/include/mach/entry-macro.S
	arch/arm/mach-exynos4/mach-smdkc210.c
	arch/arm/mach-exynos4/mach-smdkv310.c
	arch/arm/mach-exynos4/mct.c

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2011-11-01 00:11:41 +01:00
..
include/mach
Merge branch 'depends/rmk/devel-stable' into next/board
2011-11-01 00:11:41 +01:00
core.c
arm/versatile: Add device tree support
2011-07-28 01:32:04 -06:00
core.h
arm/versatile: Add device tree support
2011-07-28 01:32:04 -06:00
Kconfig
arm/versatile: Add device tree support
2011-07-28 01:32:04 -06:00
Makefile
arm/versatile: Add device tree support
2011-07-28 01:32:04 -06:00
Makefile.boot
Linux-2.6.12-rc2
2005-04-16 15:20:36 -07:00
pci.c
Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6
2011-07-29 23:35:05 -07:00
versatile_ab.c
ARM: mach-versatile: convert boot-params to atag_offset
2011-08-21 17:15:19 -04:00
versatile_dt.c
arm/versatile: Add device tree support
2011-07-28 01:32:04 -06:00
versatile_pb.c
ARM: mach-versatile: convert boot-params to atag_offset
2011-08-21 17:15:19 -04:00