korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-12-16 07:24:39 +08:00
Code Issues Packages Projects Releases Wiki Activity
dcf7ec5ee6
linux/arch/arm/mach-mxs
History
Arnd Bergmann dcf7ec5ee6 Merge branch 'samsung/driver' into next/drivers 
Conflicts:
	arch/arm/mach-mxs/include/mach/common.h

Pull in previous samsung conflict merges and do a trivial
merge of an mxs double-add conflict.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2012-01-09 16:16:29 +00:00
..
devices ARM: mx28evk: add platform data for saif 2011-12-02 13:57:15 +08:00
include/mach Merge branch 'samsung/driver' into next/drivers 2012-01-09 16:16:29 +00:00
clock-mx23.c mx23: register clocks for mmc 2011-05-19 13:11:35 +02:00
clock-mx28.c ARM: mx28evk: set a initial clock rate for saif 2011-12-02 13:57:16 +08:00
clock.c ARM i.MX23/28: remove secondary field from struct clk. It's unused 2011-01-24 09:01:48 +01:00
devices-mx23.h arm: mach-mxs: add device for rtc 2011-08-23 08:56:15 +02:00
devices-mx28.h ARM: mx28evk: add platform data for saif 2011-12-02 13:57:15 +08:00
devices.c gpio/mxs: Change gpio-mxs into an upstanding gpio driver 2011-06-06 10:01:19 -06:00
icoll.c arm: Fold irq_set_chip/irq_set_handler 2011-03-29 14:47:58 +02:00
iomux.c ARM: mxs: Add iomux support 2010-12-20 17:29:58 +01:00
Kconfig Merge branch 'imx-features-for-arnd' of git://git.pengutronix.de/git/imx/linux-2.6 into imx/devel 2011-10-20 15:14:25 +02:00
mach-m28evk.c ARM: restart: mxs: use new restart hook 2012-01-05 12:57:15 +00:00
mach-mx23evk.c ARM: restart: mxs: use new restart hook 2012-01-05 12:57:15 +00:00
mach-mx28evk.c Merge branch 'samsung/driver' into next/drivers 2012-01-09 16:16:29 +00:00
mach-stmp378x_devb.c ARM: restart: mxs: use new restart hook 2012-01-05 12:57:15 +00:00
mach-tx28.c ARM: restart: mxs: use new restart hook 2012-01-05 12:57:15 +00:00
Makefile Merge branch 'next/board' of git://git.linaro.org/people/arnd/arm-soc 2011-11-01 20:25:36 -07:00
Makefile.boot ARM: 7022/1: allow to detect conflicting zreladdrs 2011-10-17 09:12:40 +01:00
mm.c ARM: mxs: Consolidate mm-mx23.c and mm-mx28.c into a single file 2011-10-04 10:08:06 +02:00
module-tx28.c ARM: mxs/tx28: add __initconst for fec pdata 2011-12-02 13:27:22 +08:00
module-tx28.h ARM: mxs: configure and register the second FEC device on TX28/STK5-V4 2011-03-23 15:08:14 +01:00
ocotp.c arm: mxs: include asm/processor.h for cpu_relax() 2011-06-06 09:50:04 +02:00
pm.c ARM: mxs: add initial pm support 2011-01-26 08:30:49 +01:00
regs-clkctrl-mx23.h ARM i.MX23: remove reserved register defines 2011-01-28 08:28:52 +01:00
regs-clkctrl-mx28.h ARM i.MX28: remove reserved register defines 2011-01-28 08:28:57 +01:00
system.c ARM: restart: mxs: use new restart hook 2012-01-05 12:57:15 +00:00
timer.c clocksource: convert MXS timrotv2 to 32-bit down counting clocksource 2011-05-23 18:04:52 +01:00