Arnd Bergmann b001befe58 Merge branch 'samsung/dt' into next/dt ... * samsung/dt: (3 commit) Merge branch 'depends/rmk/for-linus' into samsung/dt Merge branch 'depends/rmk/restart' into next/cleanup Merge branch 'next/cleanup' into samsung/dt Conflicts: arch/arm/mach-tegra/board-dt.c arch/arm/mach-tegra/include/mach/entry-macro.S The latest version of the samsung/dt branch resolves all sorts of conflicts with the latest upstream, no functional changes that are not already there. Signed-off-by: Arnd Bergmann <arnd@arndb.de>		2012-01-07 20:40:51 +00:00
..
include/mach	Merge branch 'depends/rmk/restart' into next/cleanup	2012-01-07 11:51:28 +00:00
board-dt.c	Merge branch 'samsung/dt' into next/dt	2012-01-07 20:40:51 +00: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: Don't create duplicate gpio and pinmux devices	2011-11-09 10:38:56 -08:00
board-harmony-power.c	arm/tegra: Harmony: Configure PMC for low-level interrupts	2011-10-13 15:04:55 -07:00
board-harmony.c	Merge branch 'depends/rmk/restart' into next/cleanup	2012-01-07 11:51:28 +00: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: Don't create duplicate gpio and pinmux devices	2011-11-09 10:38:56 -08:00
board-paz00.c	Merge branch 'depends/rmk/restart' into next/cleanup	2012-01-07 11:51:28 +00: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: enable headphone detection gpio on seaboard	2011-11-09 11:31:16 -08:00
board-seaboard.c	Merge branch 'depends/rmk/restart' into next/cleanup	2012-01-07 11:51:28 +00: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/tegra: Don't create duplicate gpio and pinmux devices	2011-11-09 10:38:56 -08:00
board-trimslice.c	Merge branch 'depends/rmk/restart' into next/cleanup	2012-01-07 11:51:28 +00: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
clock.c	switch assorted clock drivers to debugfs_remove_recursive()	2011-07-20 20:47:51 -04:00
clock.h
common.c	ARM: restart: tegra: use new restart hook	2012-01-05 12:57:20 +00:00
cpu-tegra.c	Merge branch 'next/cleanup' of git://git.linaro.org/people/arnd/arm-soc	2011-11-01 20:11:00 -07:00
devices.c	Merge branch 'next/devel' of git://git.linaro.org/people/arnd/arm-soc	2011-11-01 20:31:25 -07:00
devices.h	arm/tegra: Prep boards for gpio/pinmux conversion to pdevs	2011-10-11 17:19:56 -07:00
dma.c	ARM: tegra: dma: staticify some tables and functions	2011-10-13 14:08:29 -07:00
fuse.c
fuse.h
gpio-names.h
headsmp.S
hotplug.c
io.c	ARM: mach-tegra: remove arch specific special handling for ioremap	2011-11-16 18:06:18 -05:00
irq.c	Merge branch 'tegra/dt' into next/dt	2011-12-27 23:21:16 +00:00
Kconfig	ARM: GIC: Make MULTI_IRQ_HANDLER mandatory	2011-11-15 18:14:02 +00:00
localtimer.c
Makefile	arm/tegra: fix variable formatting in makefile	2011-12-07 21:16:03 -08:00
Makefile.boot	arm/dt: tegra: add dts file for paz00	2011-12-07 20:47:50 -08:00
pcie.c	Merge branch 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux	2011-11-06 19:44:47 -08:00
pinmux-t2-tables.c	arm/tegra: pinmux: ioremap registers	2011-10-13 15:04:53 -07:00
pinmux.c	arm/tegra: pinmux: ioremap registers	2011-10-13 15:04:53 -07:00
platsmp.c	ARM: smp: fix clipping of number of CPUs	2011-10-20 22:06:57 +01:00
powergate.c	ARM: tegra: tegra_powergate_is_powered should be static	2011-10-13 14:08:28 -07:00
tegra2_clocks.c	ARM: tegra: tegra2_clocks: don't export some tables	2011-10-13 14:08:29 -07:00
tegra2_emc.c
tegra2_emc.h
timer.c	ARM: 7205/2: sched_clock: allow sched_clock to be selected at runtime	2011-12-18 23:00:26 +00: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