Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-22 02:52:56 +00:00
Code Issues Packages Projects Releases Wiki Activity
205056a3ea
linux/arch/arm/mach-exynos
History
Olof Johansson a5f17d1f4c Linux 3.3-rc2 
.. several days delayed. No reason, I just didn't think of it.
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
 iQEcBAABAgAGBQJPKF4KAAoJEHm+PkMAQRiGw/YH+wXg2DpZUuHeBK52zMGlJBPc
 DzX11/Uan3Y07gM0JbDzuVxwjX4vdxR2bV6r1qsLP8JEUnE8jyFC32DBGi5WAht7
 F4KU/Uov2Ds5/wzvY4Iuo01C+JftQHXuy/Sbhck1d0LI0yjLejRaw+zuJv0x2/eS
 7YqV+KTGE1lDuJs/Gyq1Vqr1g9831AuS1tv/g3gaqBuN6TcPBFCocaVxzwrUc+y6
 94h26XbbOhQRIz38oqUkiqAGnvYS61ocyBcEiRHf0dXkNSDIINqlgukvd7YTXouA
 jj/w/DWpMRcQuYAgqkrurr9+yWC9hVQcsvvQ5sAQnIPcxoR868sg1pO8Oheq+1g=
 =kUzV
 -----END PGP SIGNATURE-----

Merge tag 'v3.3-rc2' into depends/rmk/for-armsoc

There were conflicts between fixes going in after 3.3-rc1 and
Russell's stable arm-soc base branch. Resolving it in the dependency
branch so that each topic branch shares the same resolution.

Conflicts:
	arch/arm/mach-at91/at91cap9.c
	arch/arm/mach-at91/at91sam9g45.c
2012-02-07 15:05:20 -08:00
..
include/mach ARM: big removal of now unused arch_idle() 2012-01-20 19:25:58 -05:00
clock-exynos4210.c ARM: 7257/1: EXYNOS: introduce arch/arm/mach-exynos/common.[ch] 2012-01-03 10:25:04 +00:00
clock-exynos4212.c ARM: 7257/1: EXYNOS: introduce arch/arm/mach-exynos/common.[ch] 2012-01-03 10:25:04 +00:00
clock.c Merge branch 'samsung/cleanup' into samsung/driver 2012-01-09 16:14:07 +00:00
common.c ARM: mach-exynos: use standard arch_idle() 2012-01-20 18:55:08 -05:00
common.h ARM: 7262/1: restart: EXYNOS: use new restart hook 2012-01-05 12:57:10 +00:00
cpuidle.c ARM: EXYNOS: Fix compiler error with THIS_MODULE 2011-11-09 14:07:32 +09:00
dev-ahci.c ARM: EXYNOS: Add ARCH_EXYNOS and reorganize arch/arm/mach-exynos 2011-11-06 13:54:56 +09:00
dev-audio.c ARM: EXYNOS: Add ARCH_EXYNOS and reorganize arch/arm/mach-exynos 2011-11-06 13:54:56 +09:00
dev-dwmci.c ARM: EXYNOS: Add ARCH_EXYNOS and reorganize arch/arm/mach-exynos 2011-11-06 13:54:56 +09:00
dev-ohci.c ARM: EXYNOS: Add USB OHCI device 2011-12-23 11:21:28 +09:00
dev-pd.c ARM: EXYNOS: Add ARCH_EXYNOS and reorganize arch/arm/mach-exynos 2011-11-06 13:54:56 +09:00
dev-sysmmu.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
dma.c ARM: amba: samsung: use common amba device initializers 2012-01-26 19:59:30 +00:00
headsmp.S ARM: exynos: remove incorrect BSYM usage 2012-01-16 08:36:04 -06:00
hotplug.c ARM: 7293/1: logical_cpu_map: decouple CPU mapping from SMP 2012-01-23 10:20:05 +00:00
Kconfig Merge branch 'samsung/driver' into next/drivers 2012-01-09 16:16:29 +00:00
mach-armlex4210.c Merge branch 'depends/rmk/restart' into next/cleanup 2012-01-07 11:51:28 +00:00
mach-exynos4-dt.c ARM: EXYNOS: Add Exynos4 device tree enabled board file 2011-12-23 10:07:11 +09:00
mach-nuri.c Merge branch 'samsung/dt' into samsung/cleanup 2012-01-09 16:01:00 +00:00
mach-origen.c ARM: EXYNOS: Invert VCLK polarity for framebuffer on ORIGEN 2012-01-12 02:20:59 +09:00
mach-smdk4x12.c Merge branch 'depends/rmk/restart' into next/cleanup 2012-01-07 11:51:28 +00:00
mach-smdkv310.c Merge branch 'samsung/driver' into next/drivers 2012-01-09 16:16:29 +00:00
mach-universal_c210.c Merge branch 'samsung/dt' into samsung/cleanup 2012-01-09 16:01:00 +00:00
Makefile Merge branch 'samsung/driver' into next/drivers 2012-01-09 16:16:29 +00:00
Makefile.boot ARM: EXYNOS: Add ARCH_EXYNOS and reorganize arch/arm/mach-exynos 2011-11-06 13:54:56 +09:00
mct.c ARM: EXYNOS: Fix build error without CONFIG_LOCAL_TIMERS 2011-12-08 10:09:32 +09:00
platsmp.c ARM: 7293/1: logical_cpu_map: decouple CPU mapping from SMP 2012-01-23 10:20:05 +00:00
pm.c Cleanups for the Samsung platforms 2012-01-09 14:30:28 -08:00
pmu.c ARM: EXYNOS: Add ARCH_EXYNOS and reorganize arch/arm/mach-exynos 2011-11-06 13:54:56 +09:00
setup-fimc.c ARM: EXYNOS: Add ARCH_EXYNOS and reorganize arch/arm/mach-exynos 2011-11-06 13:54:56 +09:00
setup-fimd0.c ARM: EXYNOS: Add ARCH_EXYNOS and reorganize arch/arm/mach-exynos 2011-11-06 13:54:56 +09:00
setup-i2c0.c ARM: EXYNOS: Add ARCH_EXYNOS and reorganize arch/arm/mach-exynos 2011-11-06 13:54:56 +09:00
setup-i2c1.c ARM: EXYNOS: Add ARCH_EXYNOS and reorganize arch/arm/mach-exynos 2011-11-06 13:54:56 +09:00
setup-i2c2.c ARM: EXYNOS: Add ARCH_EXYNOS and reorganize arch/arm/mach-exynos 2011-11-06 13:54:56 +09:00
setup-i2c3.c ARM: EXYNOS: Add ARCH_EXYNOS and reorganize arch/arm/mach-exynos 2011-11-06 13:54:56 +09:00
setup-i2c4.c ARM: EXYNOS: Add ARCH_EXYNOS and reorganize arch/arm/mach-exynos 2011-11-06 13:54:56 +09:00
setup-i2c5.c ARM: EXYNOS: Add ARCH_EXYNOS and reorganize arch/arm/mach-exynos 2011-11-06 13:54:56 +09:00
setup-i2c6.c ARM: EXYNOS: Add ARCH_EXYNOS and reorganize arch/arm/mach-exynos 2011-11-06 13:54:56 +09:00
setup-i2c7.c ARM: EXYNOS: Add ARCH_EXYNOS and reorganize arch/arm/mach-exynos 2011-11-06 13:54:56 +09:00
setup-keypad.c ARM: EXYNOS: Add ARCH_EXYNOS and reorganize arch/arm/mach-exynos 2011-11-06 13:54:56 +09:00
setup-sdhci-gpio.c ARM: EXYNOS: Add ARCH_EXYNOS and reorganize arch/arm/mach-exynos 2011-11-06 13:54:56 +09:00
setup-spi.c ARM: EXYNOS: Modified files for SPI consolidation work 2011-12-26 16:42:15 +09:00
setup-usb-phy.c ARM: EXYNOS: Add USB OHCI device 2011-12-23 11:21:28 +09:00