Linus Torvalds 7affca3537 Merge branch 'driver-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core ... * 'driver-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core: (73 commits) arm: fix up some samsung merge sysdev conversion problems firmware: Fix an oops on reading fw_priv->fw in sysfs loading file Drivers:hv: Fix a bug in vmbus_driver_unregister() driver core: remove __must_check from device_create_file debugfs: add missing #ifdef HAS_IOMEM arm: time.h: remove device.h #include driver-core: remove sysdev.h usage. clockevents: remove sysdev.h arm: convert sysdev_class to a regular subsystem arm: leds: convert sysdev_class to a regular subsystem kobject: remove kset_find_obj_hinted() m86k: gpio - convert sysdev_class to a regular subsystem mips: txx9_sram - convert sysdev_class to a regular subsystem mips: 7segled - convert sysdev_class to a regular subsystem sh: dma - convert sysdev_class to a regular subsystem sh: intc - convert sysdev_class to a regular subsystem power: suspend - convert sysdev_class to a regular subsystem power: qe_ic - convert sysdev_class to a regular subsystem power: cmm - convert sysdev_class to a regular subsystem s390: time - convert sysdev_class to a regular subsystem ... Fix up conflicts with 'struct sysdev' removal from various platform drivers that got changed: - arch/arm/mach-exynos/cpu.c - arch/arm/mach-exynos/irq-eint.c - arch/arm/mach-s3c64xx/common.c - arch/arm/mach-s3c64xx/cpu.c - arch/arm/mach-s5p64x0/cpu.c - arch/arm/mach-s5pv210/common.c - arch/arm/plat-samsung/include/plat/cpu.h - arch/powerpc/kernel/sysfs.c and fix up cpu_is_hotpluggable() as per Greg in include/linux/cpu.h		2012-01-07 12:03:30 -08:00
..
include/mach	Merge branch 'restart' into for-linus	2012-01-05 13:25:27 +00: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	ARM: 7257/1: EXYNOS: introduce arch/arm/mach-exynos/common.[ch]	2012-01-03 10:25:04 +00:00
common.c	Merge branch 'driver-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core	2012-01-07 12:03:30 -08: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
dev-audio.c
dev-dwmci.c
dev-pd.c
dev-sysmmu.c
dma.c
headsmp.S
hotplug.c
Kconfig	ARM: SMP: Refactor Kconfig to be more maintainable	2011-12-19 13:47:39 +00:00
mach-armlex4210.c	Merge branch 'restart' into for-linus	2012-01-05 13:25:27 +00:00
mach-nuri.c	Merge branch 'restart' into for-linus	2012-01-05 13:25:27 +00:00
mach-origen.c	Merge branch 'restart' into for-linus	2012-01-05 13:25:27 +00:00
mach-smdk4x12.c	Merge branch 'restart' into for-linus	2012-01-05 13:25:27 +00:00
mach-smdkv310.c	Merge branch 'restart' into for-linus	2012-01-05 13:25:27 +00:00
mach-universal_c210.c	Merge branch 'restart' into for-linus	2012-01-05 13:25:27 +00:00
Makefile	ARM: 7257/1: EXYNOS: introduce arch/arm/mach-exynos/common.[ch]	2012-01-03 10:25:04 +00:00
Makefile.boot
mct.c	ARM: EXYNOS: Fix build error without CONFIG_LOCAL_TIMERS	2011-12-08 10:09:32 +09:00
platsmp.c	ARM: gic: allow GIC to support non-banked setups	2011-11-15 18:13:03 +00:00
pm.c	arm: convert sysdev_class to a regular subsystem	2011-12-21 16:01:38 -08:00
pmu.c
setup-fimc.c
setup-fimd0.c
setup-i2c0.c
setup-i2c1.c
setup-i2c2.c
setup-i2c3.c
setup-i2c4.c
setup-i2c5.c
setup-i2c6.c
setup-i2c7.c
setup-keypad.c
setup-sdhci-gpio.c
setup-sdhci.c
setup-usb-phy.c