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
..
54xx	m68k: add ColdFire 54xx CPU MMU memory init code	2011-12-30 10:20:23 +10:00
68EZ328	m68k: merge m68k and m68knommu arch directories	2011-03-25 14:05:13 +10:00
68VZ328	m68k: merge m68k and m68knommu arch directories	2011-03-25 14:05:13 +10:00
520x	m68knommu: fix problems with SPI/GPIO on ColdFire 520x	2011-10-18 14:22:25 +10:00
523x	Fix common misspellings	2011-03-31 11:26:23 -03:00
527x	Fix common misspellings	2011-03-31 11:26:23 -03:00
528x	Fix common misspellings	2011-03-31 11:26:23 -03:00
532x	m68k: merge m68k and m68knommu arch directories	2011-03-25 14:05:13 +10:00
5206	m68knommu: merge ColdFire 5206 and 5206e platform code	2011-07-25 11:20:41 +10:00
5249	m68k: Convert irq function namespace	2011-03-29 14:48:15 +02:00
5272	m68knommu: correctly use trap_init	2011-07-25 11:20:41 +10:00
5307	m68k: merge m68k and m68knommu arch directories	2011-03-25 14:05:13 +10:00
5407	m68k: merge m68k and m68knommu arch directories	2011-03-25 14:05:13 +10:00
68328	m68knommu: remove no longer used rom_length from Palm/Pilot start up code	2011-12-30 10:20:15 +10:00
68360	m68k: merge mmu and non-mmu include/asm/entry.h files	2011-10-18 14:22:25 +10:00
coldfire	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
Makefile	m68k: merge m68k and m68knommu arch directories	2011-03-25 14:05:13 +10:00