leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
ff4b8a57f0
linux/arch/arm/mach-s5pv210
History
Greg Kroah-Hartman ff4b8a57f0 Merge branch 'driver-core-next' into Linux 3.2 
This resolves the conflict in the arch/arm/mach-s3c64xx/s3c6400.c file,
and it fixes the build error in the arch/x86/kernel/microcode_core.c
file, that the merge did not catch.

The microcode_core.c patch was provided by Stephen Rothwell
<sfr@canb.auug.org.au> who was invaluable in the merge issues involved
with the large sysdev removal process in the driver-core tree.

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2012-01-06 11:42:52 -08:00
..
include/mach Merge branch 'next/cleanup3' of git://git.linaro.org/people/arnd/arm-soc 2011-11-05 18:18:05 -07:00
clock.c driver-core: remove sysdev.h usage. 2011-12-21 16:26:03 -08:00
cpu.c arm: convert sysdev_class to a regular subsystem 2011-12-21 16:01:38 -08:00
dev-audio.c ARM: SAMSUNG: Add IRQ_I2S0 definition 2011-07-21 17:27:28 +09:00
dev-spi.c ARM: SAMSUNG: Add tx_st_done variable 2011-07-06 15:03:08 +09:00
dma.c ARM: S5PV210: register the second instance of pl330 DMAC 2011-09-19 10:27:23 +09:00
init.c ARM: S5PV210: Add Samsung S5PV210 CPU support 2010-02-24 22:47:21 +00:00
Kconfig Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma 2011-11-04 18:02:25 -07:00
mach-aquila.c ARM: mach-s5pc100, mach-s5pv210: convert boot_params to atag_offset 2011-08-21 17:15:12 -04:00
mach-goni.c Merge branch 'depends/rmk/memory_h' into next/cleanup2 2011-11-01 04:58:59 +01:00
mach-smdkc110.c driver-core: remove sysdev.h usage. 2011-12-21 16:26:03 -08:00
mach-smdkv210.c Merge branch 'driver-core-next' into Linux 3.2 2012-01-06 11:42:52 -08:00
mach-torbreck.c ARM: mach-s5pc100, mach-s5pv210: convert boot_params to atag_offset 2011-08-21 17:15:12 -04:00
Makefile ARM: S5P: Make the sleep code common for S5P series SoCs 2011-10-04 20:25:51 +09:00
Makefile.boot ARM: 7022/1: allow to detect conflicting zreladdrs 2011-10-17 09:12:40 +01:00
pm.c arm: convert sysdev_class to a regular subsystem 2011-12-21 16:01:38 -08:00
setup-fb-24bpp.c ARM: S5PV210: Cleanup mach/regs-fb.h from mach-s5pv210 2011-07-21 02:11:34 +09:00
setup-fimc.c ARM: S5P: Add platform helpers for camera GPIO configuration 2011-03-11 15:49:00 +09:00
setup-i2c0.c ARM: S5PV210: 2nd Change to using s3c_gpio_cfgall_range() 2010-10-23 11:51:09 +09:00
setup-i2c1.c ARM: S5PV210: 2nd Change to using s3c_gpio_cfgall_range() 2010-10-23 11:51:09 +09:00
setup-i2c2.c ARM: S5PV210: 2nd Change to using s3c_gpio_cfgall_range() 2010-10-23 11:51:09 +09:00
setup-ide.c ARM: S5PV210: 2nd Change to using s3c_gpio_cfgrange_nopull() 2010-10-23 11:52:26 +09:00
setup-keypad.c ARM: S5PV210: 2nd Change to using s3c_gpio_cfgrange_nopull() 2010-10-23 11:52:26 +09:00
setup-sdhci-gpio.c Fix common misspellings 2011-03-31 11:26:23 -03:00
setup-sdhci.c ARM: SAMSUNG: remove sdhci default configuration setup platform helper 2011-10-04 19:48:40 +09:00