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
..
arch.h	Merge branch 'for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/will/linux into devel-stable	2011-12-05 23:20:17 +00:00
dma.h	[ARM] dma: move IOMD and floppy DMA structures to RiscPC DMA code	2009-02-21 21:36:22 +00:00
flash.h	[ARM] move include/asm-arm to arch/arm/include/asm	2008-08-02 21:32:35 +01:00
irda.h	[ARM] move include/asm-arm to arch/arm/include/asm	2008-08-02 21:32:35 +01:00
irq.h	ARM: 6806/1: irq: introduce entry and exit functions for chained handlers	2011-03-15 09:42:28 +00:00
map.h	ARM: mm: Add strongly ordered descriptor support.	2011-09-23 12:05:30 +05:30
pci.h	PCI: Make the struct pci_dev * argument of pci_fixup_irqs const.	2011-07-22 08:26:06 -07:00
serial_at91.h	[ARM] move include/asm-arm to arch/arm/include/asm	2008-08-02 21:32:35 +01:00
serial_sa1100.h	[ARM] move include/asm-arm to arch/arm/include/asm	2008-08-02 21:32:35 +01:00
sharpsl_param.h	[ARM] move include/asm-arm to arch/arm/include/asm	2008-08-02 21:32:35 +01:00
time.h	arm: time.h: remove device.h #include	2011-12-22 09:46:36 -08:00
udc_pxa2xx.h	ARM: pxa: drop gpio_vbus field from pxa2xx_udc_mach_info	2011-03-16 16:33:34 +08:00