leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity
8d84981e39
linux/arch/arm/plat-samsung
History
Olof Johansson 8d84981e39 Merge branch 'clocksource/cleanup' into next/cleanup 
Clockevent cleanup series from Shawn Guo.

Resolved move/change conflict in mach-pxa/time.c due to the sys_timer
cleanup.

* clocksource/cleanup:
  clocksource: use clockevents_config_and_register() where possible
  ARM: use clockevents_config_and_register() where possible
  clockevents: export clockevents_config_and_register for module use
  + sync to Linux 3.8-rc3

Signed-off-by: Olof Johansson <olof@lixom.net>

Conflicts:
	arch/arm/mach-pxa/time.c
2013-01-14 10:20:02 -08:00
..
include/plat Merge branch 'clocksource/cleanup' into next/cleanup 2013-01-14 10:20:02 -08:00
adc.c ARM: drivers: remove __dev* attributes. 2013-01-03 15:57:04 -08:00
clock-clksrc.c driver-core: remove sysdev.h usage. 2011-12-21 16:26:03 -08:00
clock.c ARM: SAMSUNG: call clk_get_rate for debugfs rate files 2012-10-23 19:19:22 +09:00
cpu.c Disintegrate asm/system.h for ARM 2012-03-28 18:30:01 +01:00
dev-backlight.c ARM: SAMSUNG: Add __init attribute to samsung_bl_set() 2012-03-09 08:03:13 -08:00
dev-uart.c
devs.c Sound updates for 3.8-rc1 2012-12-13 11:51:23 -08:00
dma-ops.c ARM: SAMSUNG: dma-ops: Fix dmaengine_prep_dma_cyclic() parameter list 2012-09-24 18:35:47 +02:00
dma.c ARM: SAMSUNG: DMA Cleanup as per sparse 2011-07-16 15:50:19 +09:00
init.c ARM: SAMSUNG: Add support for handling of cpu revision 2011-08-24 19:25:19 +09:00
irq-vic-timer.c ARM: EXYNOS: add interrupt definitions for EXYNOS5250 2012-03-14 02:35:04 -07:00
Kconfig Merge branch 'next/devel-samsung-3' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/soc 2012-11-30 09:32:24 -08:00
Makefile ARM: SAMSUNG: Add s3c24xx/s3c64xx CAMIF GPIO setup helpers 2012-11-28 08:03:27 +09:00
platformdata.c ARM: SAMSUNG: remove all uses of clk_type member in sdhci platform data 2012-04-21 08:24:56 -07:00
pm-check.c treewide: Convert uses of struct resource to resource_size(ptr) 2011-06-10 14:55:36 +02:00
pm-gpio.c driver-core: remove sysdev.h usage. 2011-12-21 16:26:03 -08:00
pm.c ARM: Samsung: Make uart_save static in pm.c file 2012-08-08 09:04:51 +09:00
pwm-clock.c ARM: SAMSUNG: Consolidate plat/pwm-clock.h 2011-10-04 19:48:41 +09:00
s3c-dma-ops.c ARM: SAMSUNG: Add config() function in DMA common operations 2012-06-20 08:07:35 +09:00
s5p-clock.c ARM: SAMSUNG: Update default rate for xusbxti clock 2012-07-13 15:34:30 +09:00
s5p-dev-mfc.c ARM: EXYNOS: Add MFC device tree support 2012-10-19 10:26:31 +09:00
s5p-dev-uart.c ARM: SAMSUNG: move platform device for s5p uart into plat-samsung 2012-05-13 07:01:51 +09:00
s5p-irq-eint.c ARM: SAMSUNG: move interrupt part for common s5p into plat-samsung 2012-05-13 07:01:27 +09:00
s5p-irq-gpioint.c ARM: SAMSUNG: Insert bitmap_gpio_int member in samsung_gpio_chip 2012-10-23 22:39:33 +09:00
s5p-irq-pm.c ARM: SAMSUNG: move pm part for common s5p into plat-samsung 2012-05-13 07:01:34 +09:00
s5p-irq.c ARM: SAMSUNG: move interrupt part for common s5p into plat-samsung 2012-05-13 07:01:27 +09:00
s5p-pm.c ARM: SAMSUNG: move pm part for common s5p into plat-samsung 2012-05-13 07:01:34 +09:00
s5p-sleep.S ARM: SAMSUNG: move pm part for common s5p into plat-samsung 2012-05-13 07:01:34 +09:00
s5p-time.c Merge branch 'clocksource/cleanup' into next/cleanup 2013-01-14 10:20:02 -08:00
setup-camif.c ARM: SAMSUNG: Add s3c24xx/s3c64xx CAMIF GPIO setup helpers 2012-11-28 08:03:27 +09:00
setup-mipiphy.c [media] ARM: samsung: Change __s5p_mipi_phy_control() function signature 2012-10-05 22:28:43 -03:00
time.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
wakeup-mask.c driver-core: remove sysdev.h usage. 2011-12-21 16:26:03 -08:00