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
..
appldata	sched/accounting: Change cpustat fields to an array	2011-12-06 09:06:38 +01:00
boot	[S390] sparse: fix sparse static warnings	2011-10-30 15:16:46 +01:00
crypto	[S390] crypto: avoid MSA3 and MSA4 instructions in ESA mode	2011-11-14 11:19:09 +01:00
hypfs	filesystems: add set_nlink()	2011-11-02 12:53:43 +01:00
include/asm	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next	2012-01-06 17:22:09 -08:00
kernel	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
kvm	KVM: s390: announce SYNC_MMU	2011-11-17 16:25:52 +02:00
lib	[S390] sparse: fix sparse warnings with __user pointers	2011-10-30 15:16:46 +01:00
math-emu	s390: change to new flag variable	2011-03-17 14:02:57 +01:00
mm	[S390] pfault: ignore leftover completion interrupts	2011-11-14 11:19:08 +01:00
oprofile	Merge branch 'perf-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2012-01-06 08:02:58 -08:00
defconfig	[S390] defconfig: switch on CONFIG_DEVTMPFS	2011-10-30 15:16:42 +01:00
Kbuild	[S390] standardize Kbuild rules	2010-10-25 16:10:14 +02:00
Kconfig	memblock: Kill early_node_map[]	2011-12-08 10:22:09 -08:00
Kconfig.debug	[S390] Write protect module text and RO data	2011-03-15 17:08:23 +01:00
Makefile	[S390] remove redundant stack check option	2011-03-15 17:08:22 +01:00