Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-24 20:01:55 +00:00
Code Issues Packages Projects Releases Wiki Activity
8504a3cb5c
linux/arch/arm/mach-mx5
History
Linus Torvalds a0a4194c94 Merge branch 'for-next' of git://git.infradead.org/users/sameo/mfd-2.6 
* 'for-next' of git://git.infradead.org/users/sameo/mfd-2.6: (80 commits)
  mfd: Fix missing abx500 header file updates
  mfd: Add missing <linux/io.h> include to intel_msic
  x86, mrst: add platform support for MSIC MFD driver
  mfd: Expose TurnOnStatus in ab8500 sysfs
  mfd: Remove support for early drop ab8500 chip
  mfd: Add support for ab8500 v3.3
  mfd: Add ab8500 interrupt disable hook
  mfd: Convert db8500-prcmu panic() into pr_crit()
  mfd: Refactor db8500-prcmu request_clock() function
  mfd: Rename db8500-prcmu init function
  mfd: Fix db5500-prcmu defines
  mfd: db8500-prcmu voltage domain consumers additions
  mfd: db8500-prcmu reset code retrieval
  mfd: db8500-prcmu tweak for modem wakeup
  mfd: Add db8500-pcmu watchdog accessor functions for watchdog
  mfd: hwacc power state db8500-prcmu accessor
  mfd: Add db8500-prcmu accessors for PLL and SGA clock
  mfd: Move to the new db500 PRCMU API
  mfd: Create a common interface for dbx500 PRCMU drivers
  mfd: Initialize DB8500 PRCMU regs
  ...

Fix up trivial conflicts in
	arch/arm/mach-imx/mach-mx31moboard.c
	arch/arm/mach-omap2/board-omap3beagle.c
	arch/arm/mach-u300/include/mach/irqs.h
	drivers/mfd/wm831x-spi.c
2011-11-03 09:40:51 -07:00
..
board-cpuimx51.c Merge branch 'next/devel' of git://git.linaro.org/people/arnd/arm-soc 2011-11-01 20:31:25 -07:00
board-cpuimx51sd.c Merge branch 'next/devel' of git://git.linaro.org/people/arnd/arm-soc 2011-11-01 20:31:25 -07:00
board-mx50_rdp.c ARM i.MX boards: use CONFIG_MULTI_IRQ_HANDLER 2011-09-26 11:40:36 +02:00
board-mx51_3ds.c Merge branch 'next/devel' of git://git.linaro.org/people/arnd/arm-soc 2011-11-01 20:31:25 -07:00
board-mx51_babbage.c Merge branch 'next/devel' of git://git.linaro.org/people/arnd/arm-soc 2011-11-01 20:31:25 -07:00
board-mx51_efikamx.c Merge branch 'next/devel' of git://git.linaro.org/people/arnd/arm-soc 2011-11-01 20:31:25 -07:00
board-mx51_efikasb.c Merge branch 'next/devel' of git://git.linaro.org/people/arnd/arm-soc 2011-11-01 20:31:25 -07:00
board-mx53_ard.c Merge branch 'next/driver' of git://git.linaro.org/people/arnd/arm-soc 2011-11-01 20:16:43 -07:00
board-mx53_evk.c Merge branch 'imx/devel' into next/dt 2011-11-01 17:12:22 +01:00
board-mx53_loco.c Merge branch 'imx/devel' into next/dt 2011-11-01 17:12:22 +01:00
board-mx53_smd.c Merge branch 'imx/devel' into next/dt 2011-11-01 17:12:22 +01:00
clock-mx51-mx53.c Merge branch 'next/driver' of git://git.linaro.org/people/arnd/arm-soc 2011-11-01 20:16:43 -07:00
cpu_op-mx51.c cpufreq for freescale mx51 2010-10-22 08:24:14 +02:00
cpu_op-mx51.h cpufreq for freescale mx51 2010-10-22 08:24:14 +02:00
cpu.c ARM: mx5: use generic function for displaying silicon revision 2011-08-26 08:51:00 +02:00
crm_regs.h ARM: mx53: Add support for missing UARTs 2011-07-07 10:01:12 +02:00
devices-imx50.h ARM: imx: clean up the section marks of extern data 2011-05-19 13:11:11 +02:00
devices-imx51.h Merge branch 'next/driver' of git://git.linaro.org/people/arnd/arm-soc 2011-11-01 20:16:43 -07:00
devices-imx53.h Merge branches 'imx/pata' and 'imx/sata' into next/driver 2011-10-20 15:17:34 +02:00
efika.h efikamx: add usb h1 support 2011-02-18 10:56:38 +01:00
ehci.c ARM: mx5: dynamically allocate mxc-ehci devices 2011-08-01 11:16:55 +02:00
eukrea_mbimx51-baseboard.c Merge branches 'cleanups/assorted', 'cleanups/shawn-cleanup-mxc-gpio', 'cleanups/troy-cleanup-iomux-v3' and 'cleanups/ukl-mx5-dynamically-allocate-devices' into imx-cleanups-for-arnd 2011-08-26 10:09:31 +02:00
eukrea_mbimxsd-baseboard.c Merge branches 'cleanups/assorted', 'cleanups/shawn-cleanup-mxc-gpio', 'cleanups/troy-cleanup-iomux-v3' and 'cleanups/ukl-mx5-dynamically-allocate-devices' into imx-cleanups-for-arnd 2011-08-26 10:09:31 +02:00
imx51-dt.c arm/mx5: add device tree support for imx51 babbage 2011-10-18 12:43:19 +02:00
imx53-dt.c arm/mx5: add device tree support for imx53 boards 2011-10-18 12:42:57 +02:00
Kconfig Merge branch 'next/driver' of git://git.linaro.org/people/arnd/arm-soc 2011-11-01 20:16:43 -07:00
Makefile Merge branch 'imx/devel' into next/dt 2011-11-01 17:12:22 +01:00
Makefile.boot ARM: 7022/1: allow to detect conflicting zreladdrs 2011-10-17 09:12:40 +01:00
mm.c Merge branches 'cleanups/mx3-mm-v2' and 'cleanups/mxs' into imx-cleanup 2011-10-04 10:55:53 +02:00
mx51_efika.c Merge branch 'for-next' of git://git.infradead.org/users/sameo/mfd-2.6 2011-11-03 09:40:51 -07:00
pm-imx5.c Merge branch 'next/fixes' into next/cleanup 2011-10-31 23:25:41 +01:00
system.c arm/imx: remove cpu_is_xxx() from arch_idle() 2011-10-04 10:55:06 +02:00