diff options
| author | Arnd Bergmann | 2011-10-31 23:58:06 +0100 |
|---|---|---|
| committer | Arnd Bergmann | 2011-11-01 00:11:41 +0100 |
| commit | a7fadac10ffbfd16cc7ccf951eab1ecf85e1abdf (patch) | |
| tree | 64a1035b02cb8aae34b96fc7c1c7caaad337ac07 /net/ceph/ceph_common.c | |
| parent | Merge branch 'depends/rmk/gpio' into next/board (diff) | |
| parent | ARM: 7139/1: fix compilation with CONFIG_ARM_ATAG_DTB_COMPAT and large TEXT_O... (diff) | |
| download | kernel-qcow2-linux-a7fadac10ffbfd16cc7ccf951eab1ecf85e1abdf.tar.gz kernel-qcow2-linux-a7fadac10ffbfd16cc7ccf951eab1ecf85e1abdf.tar.xz kernel-qcow2-linux-a7fadac10ffbfd16cc7ccf951eab1ecf85e1abdf.zip | |
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>
Diffstat (limited to 'net/ceph/ceph_common.c')
0 files changed, 0 insertions, 0 deletions