Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-14 07:02:23 +00:00
Code Issues Packages Projects Releases Wiki Activity
69f1d1a6ac
linux/arch/arm/mach-davinci/include/mach
History
Linus Torvalds 69f1d1a6ac Merge branch 'next/devel' of ssh://master.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc 
* 'next/devel' of ssh://master.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc: (128 commits)
  ARM: S5P64X0: External Interrupt Support
  ARM: EXYNOS4: Enable MFC on Samsung NURI
  ARM: EXYNOS4: Enable MFC on universal_c210
  ARM: S5PV210: Enable MFC on Goni
  ARM: S5P: Add support for MFC device
  ARM: EXYNOS4: Add support FIMD on SMDKC210
  ARM: EXYNOS4: Add platform device and helper functions for FIMD
  ARM: EXYNOS4: Add resource definition for FIMD
  ARM: EXYNOS4: Change devname for FIMD clkdev
  ARM: SAMSUNG: Add IRQ_I2S0 definition
  ARM: SAMSUNG: Add platform device for idma
  ARM: EXYNOS4: Add more registers to be saved and restored for PM
  ARM: EXYNOS4: Add more register addresses of CMU
  ARM: EXYNOS4: Add platform device for dwmci driver
  ARM: EXYNOS4: configure rtc-s3c on NURI
  ARM: EXYNOS4: configure MAX8903 secondary charger on NURI
  ARM: EXYNOS4: configure ADC on NURI
  ARM: EXYNOS4: configure MAX17042 fuel gauge on NURI
  ARM: EXYNOS4: configure regulators and PMIC(MAX8997) on NURI
  ARM: EXYNOS4: Increase NR_IRQS for devices with more IRQs
  ...

Fix up tons of silly conflicts:
 - arch/arm/mach-davinci/include/mach/psc.h
 - arch/arm/mach-exynos4/Kconfig
 - arch/arm/mach-exynos4/mach-smdkc210.c
 - arch/arm/mach-exynos4/pm.c
 - arch/arm/mach-imx/mm-imx1.c
 - arch/arm/mach-imx/mm-imx21.c
 - arch/arm/mach-imx/mm-imx25.c
 - arch/arm/mach-imx/mm-imx27.c
 - arch/arm/mach-imx/mm-imx31.c
 - arch/arm/mach-imx/mm-imx35.c
 - arch/arm/mach-mx5/mm.c
 - arch/arm/mach-s5pv210/mach-goni.c
 - arch/arm/mm/Kconfig
2011-07-26 17:41:04 -07:00
..
aemif.h davinci: add support for aemif timing configuration 2010-09-24 07:40:26 -07:00
asp.h ASoC: davinci: let platform data define edma queue numbers 2010-07-20 09:57:20 +01:00
cdce949.h davinci: add support for CDCE949 clock synthesizer 2010-02-04 13:29:58 -08:00
clock.h davinci: major rework of clock, PLL, PSC infrastructure 2009-04-23 09:31:00 -07:00
common.h Davinci: iotable based ioremap() interception 2010-05-13 10:05:31 -07:00
cp_intc.h Davinci: aintc/cpintc - use ioremap() 2010-05-13 10:05:28 -07:00
cpufreq.h davinci: DA850/OMAP-L138: avoid using separate initcall for initializing regulator 2009-11-25 10:21:37 -08:00
cpuidle.h davinci: cpuidle: move mapping of DDR2 controller registers out of driver 2010-02-04 13:29:38 -08:00
cputype.h Fix common misspellings 2011-03-31 11:26:23 -03:00
da8xx.h davinci: da850: add support for SATA interface 2011-07-08 11:13:08 +05:30
debug-macro.S davinci: fix DEBUG_LL code for p2v changes 2011-04-19 16:54:15 -07:00
dm355.h DaVinci: move AEMIF #define's to the proper headers 2010-05-06 15:02:06 -07:00
dm365.h davinci: cleanup mdio arch code and switch to phy_id 2010-09-24 07:40:30 -07:00
dm644x.h davinci: cleanup mdio arch code and switch to phy_id 2010-09-24 07:40:30 -07:00
dm646x.h davinci: dm6467/T EVM: fix setting up of reference clock rate 2011-07-06 16:48:45 +05:30
edma.h davinci: remove unused DA830_edma_ch enum 2011-03-11 10:48:28 -08:00
entry-macro.S ARM: entry: remove unused irq_prio_table macro 2011-06-28 10:34:58 +01:00
gpio.h Davinci: tnetv107x initial gpio support 2010-06-21 12:48:31 -07:00
hardware.h davinci: move DM64XX_VDD3P3V_PWDN to devices.c 2011-05-23 22:18:26 +05:30
i2c.h Merge branch 'for-next' into for-linus 2010-03-08 16:55:37 +01:00
io.h ARM: io: make iounmap() a simple macro 2010-12-08 13:57:04 +00:00
irqs.h Davinci: tnetv107x IRQ definitions 2010-05-06 15:02:05 -07:00
keyscan.h Input: davinci_keyscan - add device_enable method to platform data 2010-01-06 00:17:11 -08:00
memory.h ARM: mach-davinci: move from ARM_DMA_ZONE_SIZE to mdesc->dma_zone_size 2011-07-18 15:29:58 -04:00
mmc.h davinci: mmc: pass number of SG segments as platform data 2010-05-27 09:12:39 -07:00
mux.h davinci: MMC/SD and USB-OHCI configuration for Omapl138-Hawkboard 2011-02-28 14:53:28 -08:00
nand.h nand: davinci: add support for timing configuration 2010-09-24 07:40:26 -07:00
pm.h davinci: add power management support 2010-02-04 13:29:55 -08:00
psc.h Merge branch 'next/devel' of ssh://master.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc 2011-07-26 17:41:04 -07:00
serial.h davinci: fix DEBUG_LL code for p2v changes 2011-04-19 16:54:15 -07:00
spi.h davinci: spi: move event queue parameter to platform data 2011-02-28 14:53:29 -08:00
sram.h davinci: add SRAM allocator 2009-05-28 15:18:13 -07:00
system.h Davinci: watchdog reset separation across socs 2010-05-06 15:02:09 -07:00
time.h davinci: Add watchdog base address flexibility 2009-05-26 08:20:31 -07:00
timex.h davinci: explain CLOCK_TICK_RATE of 27MHz in include/mach/timex.h 2010-02-04 13:29:41 -08:00
tnetv107x.h davinci: add tnetv107x ssp platform device 2011-03-15 08:17:22 -07:00
uncompress.h ARM: zImage: remove the static qualifier from global data variables 2011-05-07 00:08:02 -04:00
usb.h DaVinci: rename setup_usb() to davinci_setup_usb() 2009-11-25 10:21:33 -08:00
vmalloc.h davinci: Move IO device mapping macros from io.h to hardware.h 2009-08-26 10:57:01 +03:00