-
- Downloads
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
Showing
- Documentation/HOWTO 2 additions, 2 deletionsDocumentation/HOWTO
- Documentation/development-process/5.Posting 4 additions, 4 deletionsDocumentation/development-process/5.Posting
- Documentation/driver-model/devres.txt 1 addition, 0 deletionsDocumentation/driver-model/devres.txt
- Documentation/filesystems/debugfs.txt 31 additions, 1 deletionDocumentation/filesystems/debugfs.txt
- MAINTAINERS 1 addition, 1 deletionMAINTAINERS
- arch/arm/include/asm/mach/time.h 0 additions, 2 deletionsarch/arm/include/asm/mach/time.h
- arch/arm/kernel/leds.c 11 additions, 10 deletionsarch/arm/kernel/leds.c
- arch/arm/mach-bcmring/core.c 0 additions, 1 deletionarch/arm/mach-bcmring/core.c
- arch/arm/mach-exynos/common.c 8 additions, 7 deletionsarch/arm/mach-exynos/common.c
- arch/arm/mach-exynos/pm.c 6 additions, 4 deletionsarch/arm/mach-exynos/pm.c
- arch/arm/mach-integrator/integrator_cp.c 1 addition, 1 deletionarch/arm/mach-integrator/integrator_cp.c
- arch/arm/mach-ks8695/irq.c 1 addition, 1 deletionarch/arm/mach-ks8695/irq.c
- arch/arm/mach-lpc32xx/phy3250.c 1 addition, 1 deletionarch/arm/mach-lpc32xx/phy3250.c
- arch/arm/mach-msm/board-sapphire.c 1 addition, 1 deletionarch/arm/mach-msm/board-sapphire.c
- arch/arm/mach-realview/core.c 1 addition, 1 deletionarch/arm/mach-realview/core.c
- arch/arm/mach-realview/realview_eb.c 1 addition, 1 deletionarch/arm/mach-realview/realview_eb.c
- arch/arm/mach-realview/realview_pb1176.c 1 addition, 1 deletionarch/arm/mach-realview/realview_pb1176.c
- arch/arm/mach-realview/realview_pb11mp.c 1 addition, 1 deletionarch/arm/mach-realview/realview_pb11mp.c
- arch/arm/mach-realview/realview_pba8.c 1 addition, 1 deletionarch/arm/mach-realview/realview_pba8.c
- arch/arm/mach-realview/realview_pbx.c 1 addition, 1 deletionarch/arm/mach-realview/realview_pbx.c
Loading
Please register or sign in to comment