openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity
linux/arch/arm/mach-tegra/include/mach
History
Linus Torvalds 16ee792e45 Merge branch 'next/devel' of git://git.linaro.org/people/arnd/arm-soc 
* 'next/devel' of git://git.linaro.org/people/arnd/arm-soc: (50 commits)
  ARM: tegra: update defconfig
  arm/tegra: Harmony: Configure PMC for low-level interrupts
  arm/tegra: device tree support for ventana board
  arm/tegra: add support for ventana pinmuxing
  arm/tegra: prepare Seaboard pinmux code for derived boards
  arm/tegra: pinmux: ioremap registers
  gpio/tegra: Convert to a platform device
  arm/tegra: Convert pinmux driver to a platform device
  arm/dt: Tegra: Add pinmux node to tegra20.dtsi
  arm/tegra: Prep boards for gpio/pinmux conversion to pdevs
  ARM: mx5: fix clock usage for suspend
  ARM i.MX entry-macro.S: remove now unused code
  ARM i.MX boards: use CONFIG_MULTI_IRQ_HANDLER
  ARM i.MX tzic: add handle_irq function
  ARM i.MX avic: add handle_irq function
  ARM: mx25: Add the missing IIM base definition
  ARM i.MX avic: convert to use generic irq chip
  mx31moboard: Add poweroff support
  ARM: mach-qong: Add watchdog support
  ARM: davinci: AM18x: Add wl1271/wlan support
  ...

Fix up conflicts in:
	arch/arm/mach-at91/at91sam9g45.c
	arch/arm/mach-mx5/devices-imx53.h
	arch/arm/plat-mxc/include/mach/memory.h
 		2011-11-01 20:31:25 -07:00
..
clk.h ARM: tegra: clock: Add function to set SDMMC tap delay 2011-02-21 00:16:47 -08:00
debug-macro.S ARM: add an extra temp register to the low level debugging addruart macro 2011-09-26 10:11:25 -04:00
dma.h Fix common misspellings 2011-03-31 11:26:23 -03:00
entry-macro.S ARM: GIC: private a standard get_irqnr_preamble assembler macro 2010-12-14 19:21:47 +00:00
gpio-tegra.h ARM: 7101/1: arm/tegra: Replace <mach/gpio.h> with <mach/gpio-tegra.h> 2011-09-27 00:20:53 +01:00
gpio.h ARM: mark empty gpio.h files empty 2011-10-29 13:05:46 +02:00
io.h ARM: tegra: annotate IO_*_VIRT pointers 2011-10-13 14:07:38 -07:00
iomap.h ARM: tegra: add devices.c entries for audio 2011-03-07 15:34:24 -08:00
irqs.h ARM: tegra: irqs: Update irq list 2011-02-09 21:57:01 -08:00
kbc.h Input: tegra-kbc - change wakeup logic to be all or nothing 2011-05-11 14:31:09 -07:00
pinmux-t2.h ARM: tegra: pinmux: Add missing drive pingroups and fix suspend 2011-02-09 21:57:02 -08:00
pinmux.h arm/tegra: pinmux: ioremap registers 2011-10-13 15:04:53 -07:00
powergate.h ARM: tegra: tegra_powergate_is_powered should be static 2011-10-13 14:08:28 -07:00
sdhci.h mmc: tegra: add pm_flags 2011-05-24 20:59:30 -04:00
suspend.h ARM: tegra: Add prototypes for subsystem suspend functions 2011-02-09 21:57:01 -08:00
system.h ARM: remove unnecessary mach/hardware.h includes 2011-07-12 11:19:27 -05:00
tegra_wm8903_pdata.h ARM: Tegra: Add to tegra_wm8903_platform_data 2011-04-18 17:55:58 +01:00
timex.h [ARM] tegra: initial tegra support 2010-08-05 14:51:42 -07:00
uncompress.h ARM: tegra: Centralize macros to define debug uart base 2011-02-09 21:56:59 -08:00
usb_phy.h ARM: tegra: Add support for Tegra USB PHYs 2011-03-11 14:22:11 -08:00
vmalloc.h arm: tegra: VMALLOC_END should be unsigned long 2010-08-22 12:54:23 -07:00