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

board-dt.c

arm/dt: tegra devicetree support

2011-07-28 01:32:04 -06:00

board-harmony-pcie.c

ARM: 7094/1: arm/tegra: Move EN_VDD_1V05_GPIO to board-harmony.h

2011-09-26 12:31:45 +01:00

board-harmony-pinmux.c

ARM: tegra: harmony: Beginnings of audio support

2011-03-07 15:34:25 -08:00

board-harmony-power.c

ARM: Tegra: Harmony: Fix conflicting GPIO numbering

2011-06-04 15:51:52 -07:00

board-harmony.c

Merge branch 'depends/rmk/devel-stable' into next/board

2011-11-01 00:11:41 +01:00

board-harmony.h

ARM: 7101/1: arm/tegra: Replace <mach/gpio.h> with <mach/gpio-tegra.h>

2011-09-27 00:20:53 +01:00

board-paz00-pinmux.c

ARM: tegra: paz00: enable wifi led

2011-08-09 12:07:40 -07:00

board-paz00.c

Merge branch 'depends/rmk/devel-stable' into next/board

2011-11-01 00:11:41 +01:00

board-paz00.h

Merge branch 'depends/rmk/gpio' into next/board

2011-10-21 16:46:26 +02:00

board-seaboard-pinmux.c

ARM: Tegra: Seaboard: Add USB devices

2011-08-09 12:07:33 -07:00

board-seaboard.c

Merge branch 'depends/rmk/devel-stable' into next/board

2011-11-01 00:11:41 +01:00

board-seaboard.h

Merge branch 'depends/rmk/gpio' into next/board

2011-10-21 16:46:26 +02:00

board-trimslice-pinmux.c

ARM: gpio: convert includes of mach/gpio.h and asm/gpio.h to linux/gpio.h

2011-08-08 14:27:41 +01:00

board-trimslice.c

Merge branch 'depends/rmk/devel-stable' into next/board

2011-11-01 00:11:41 +01:00

board-trimslice.h

ARM: 7101/1: arm/tegra: Replace <mach/gpio.h> with <mach/gpio-tegra.h>

2011-09-27 00:20:53 +01:00

board.h

ARM: tegra: Move tegra_common_init to tegra_init_early

2011-02-22 11:25:12 -08:00

clock.c

switch assorted clock drivers to debugfs_remove_recursive()

2011-07-20 20:47:51 -04:00

clock.h

ARM: tegra: clock: Add function to set SDMMC tap delay

2011-02-21 00:16:47 -08:00

common.c

ARM: Tegra: Make tegra_dma_init a postcore_initcall

2011-02-23 14:00:11 -08:00

cpu-tegra.c

ARM: tegra: cpufreq: Adjust memory frequency with cpu frequency

2011-02-21 00:16:46 -08:00

devices.c

ARM: tegra: remove copy-and-pasted usb platform data from boards

2011-07-12 20:39:40 -07:00

devices.h

ARM: tegra: add devices.c entries for audio

2011-03-07 15:34:24 -08:00

dma.c

Fix common misspellings

2011-03-31 11:26:23 -03:00

fuse.c

[ARM] tegra: Add support for reading fuses

2010-10-21 18:12:09 -07:00

fuse.h

[ARM] tegra: Add support for reading fuses

2010-10-21 18:12:09 -07:00

gpio-names.h

[ARM] tegra: add GPIO support

2010-08-05 14:57:02 -07:00

headsmp.S

…

hotplug.c

ARM: fix wrongly patched constants

2011-01-14 12:06:26 +00:00

io.c

ARM: remove unnecessary mach/hardware.h includes

2011-07-12 11:19:27 -05:00

irq.c

ARM: tegra: irq: Add tegra_eoi

2011-05-11 16:04:16 +01:00

Kconfig

Merge branch 'next/dt' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc

2011-07-29 23:32:02 -07:00

localtimer.c

ARM: 6759/1: smp: Select local timers vs broadcast timer support runtime

2011-02-23 17:54:27 +00:00

Makefile

arm/dt: tegra devicetree support

2011-07-28 01:32:04 -06:00

Makefile.boot

arm/dt: tegra devicetree support

2011-07-28 01:32:04 -06:00

pcie.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

pinmux-t2-tables.c

ARM: tegra: pinmux: Add missing drive pingroups and fix suspend

2011-02-09 21:57:02 -08:00

pinmux.c

[ARM] tegra: pinmux: add safe values, move tegra2, add suspend

2010-10-21 18:11:41 -07:00

platsmp.c

ARM: smp: fix clipping of number of CPUs

2011-10-20 22:06:57 +01:00

powergate.c

ARM: tegra: Add api to control internal powergating

2011-02-09 21:57:00 -08:00

tegra2_clocks.c

arm: tegra: remove generic disp clock divisor flag

2011-07-12 20:38:57 -07:00

tegra2_emc.c

ARM: tegra: Add external memory controller driver

2011-02-21 00:16:45 -08:00

tegra2_emc.h

ARM: tegra: Add external memory controller driver

2011-02-21 00:16:45 -08:00

timer.c

clocksource: convert ARM 32-bit up counting clocksources

2011-05-23 18:04:51 +01:00

usb_phy.c

ARM: 7101/1: arm/tegra: Replace <mach/gpio.h> with <mach/gpio-tegra.h>

2011-09-27 00:20:53 +01:00