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
..
hardware	Merge branch 'restart' into for-linus	2012-01-05 13:25:27 +00:00
mach	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
a.out-core.h
a.out.h
asm-offsets.h
assembler.h	ARM: LPAE: add ISBs around MMU enabling code	2011-12-08 10:30:38 +00:00
atomic.h	atomic: cleanup asm-generic atomic*.h inclusion	2011-07-26 16:49:47 -07:00
bitops.h	asm-generic: add another generic ext2 atomic bitops	2011-07-26 16:49:46 -07:00
bug.h	ARM: 7267/1: Remove BUILD_BUG_ON from asm/bug.h	2012-01-05 13:23:22 +00:00
bugs.h
byteorder.h
cache.h
cacheflush.h
cachetype.h	ARM: 7062/1: cache: detect PIPT I-cache using CTR	2011-10-17 09:13:41 +01:00
checksum.h
clkdev.h	ARM: Consolidate the clkdev header files	2011-07-19 18:09:45 +02:00
cpu.h
cputype.h	ARM: 7011/1: Add ARM cpu topology definition	2011-10-17 09:02:43 +01:00
cti.h	arm: introduce cross trigger interface helpers	2011-12-02 15:16:33 +00:00
current.h
delay.h
device.h	Merge branch 'next/cleanup' of git://git.linaro.org/people/arnd/arm-soc	2011-11-01 20:11:00 -07:00
div64.h
dma-mapping.h	Merge branch 'devel-stable' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm	2011-10-28 12:02:27 -07:00
dma.h	locking, ARM: Annotate low level hw locks as raw	2011-09-13 11:12:14 +02:00
domain.h
ecard.h	ARM: io: ecard: move ioaddr() inside __ecard_address	2011-08-17 08:44:16 +01:00
edac.h	ARM: 7201/1: add EDAC atomic_scrub function	2011-12-11 08:35:50 +00:00
elf.h	ARM: 6883/1: ptrace: Migrate to regsets framework	2011-05-14 21:36:55 +01:00
entry-macro-multi.S	ARM: gic: consolidate PPI handling	2011-10-23 13:32:29 +01:00
exception.h	ARM: 7115/4: move __exception and friends to asm/exception.h	2011-10-17 09:02:44 +01:00
fb.h
fcntl.h
fiq.h	ARM: 6940/1: fiq: Briefly document driver responsibilities for suspend/resume	2011-05-26 10:31:06 +01:00
fixmap.h
flat.h
floppy.h
fncpy.h
fpstate.h
ftrace.h
futex.h	ARM: 7099/1: futex: preserve oldval in SMP __futex_atomic_op	2011-09-26 12:36:47 +01:00
glue-cache.h
glue-df.h
glue-pf.h
glue-proc.h
glue.h
gpio.h	ARM: 7240/1: Make ARCH_NR_GPIO a Kconfig variable	2011-12-23 22:54:50 +00:00
hardirq.h	ARM: 7140/1: remove NR_IRQS dependency for ARM-specific HARDIRQ_BITS definition	2011-12-06 11:14:01 +00:00
highmem.h
hw_breakpoint.h	ARM: hw_breakpoint: add support for multiple watchpoints	2011-08-31 10:42:48 +01:00
hw_irq.h
hwcap.h	ARM: hwcaps: add new HWCAP defines for ARMv7-A	2011-07-07 19:20:51 +01:00
ide.h
idmap.h	ARM: SMP: use idmap_pgd for mapping MMU enable during secondary booting	2011-12-06 14:04:15 +00:00
io.h	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2011-10-25 12:11:02 +02:00
ioctls.h
ipcbuf.h
irq.h	ARM: introduce handle_IRQ() not to dump exception stack	2011-07-12 19:42:40 +08:00
irqflags.h
Kbuild	ARM: 7006/1: Migrate to asm-generic wrapper support	2011-10-17 09:12:40 +01:00
kexec.h
kgdb.h
kmap_types.h
kprobes.h	ARM: kprobes: Extend arch_specific_insn to add pointer to emulated instruction	2011-07-13 17:32:42 +00:00
leds.h
limits.h
linkage.h
localtimer.h	Merge branch 'dt/gic' into next/dt	2011-10-31 14:08:10 +01:00
locks.h
mach-types.h
mc146818rtc.h
memblock.h
memory.h	ARM: switch from NO_MACH_MEMORY_H to NEED_MACH_MEMORY_H	2011-10-13 12:53:53 -04:00
mman.h
mmu.h	locking, ARM: Annotate low level hw locks as raw	2011-09-13 11:12:14 +02:00
mmu_context.h
module.h	ARM: 7013/1: P2V: Remove ARM_PATCH_PHYS_VIRT_16BIT	2011-08-13 11:26:40 +01:00
msgbuf.h
mtd-xip.h
mutex.h
nwflash.h
opcodes.h	ARM: 7206/1: Add generic ARM instruction set condition code checks.	2011-12-13 08:52:02 +00:00
outercache.h	ARM: 7114/1: cache-l2x0: add resume entry for l2 in secure mode	2011-10-17 09:11:51 +01:00
page-nommu.h
page.h	ARM: LPAE: Introduce the 3-level page table format definitions	2011-12-08 10:30:39 +00:00
param.h
parport.h
pci.h	ARM: convert PCI defines to variables	2011-07-12 11:19:29 -05:00
perf_event.h	ARM: perf: remove unused armpmu_get_max_events	2011-12-02 15:16:25 +00:00
pgalloc.h	ARM: LPAE: Page table maintenance for the 3-level format	2011-12-08 10:30:39 +00:00
pgtable-2level-hwdef.h	ARM: 7077/1: LPAE: Use a mask for physical addresses in page table entries	2011-10-06 15:40:06 +01:00
pgtable-2level-types.h	ARM: 7076/1: LPAE: Add (pte|pmd)val_t type definitions as u32	2011-10-06 15:40:05 +01:00
pgtable-2level.h	ARM: LPAE: Move page table maintenance macros to pgtable-2level.h	2011-12-08 10:30:37 +00:00
pgtable-3level-hwdef.h	ARM: LPAE: Introduce the 3-level page table format definitions	2011-12-08 10:30:39 +00:00
pgtable-3level-types.h	ARM: LPAE: Introduce the 3-level page table format definitions	2011-12-08 10:30:39 +00:00
pgtable-3level.h	ARM: LPAE: Page table maintenance for the 3-level format	2011-12-08 10:30:39 +00:00
pgtable-hwdef.h	ARM: LPAE: Introduce the 3-level page table format definitions	2011-12-08 10:30:39 +00:00
pgtable-nommu.h
pgtable.h	Merge branch 'devel-stable' into for-linus	2012-01-05 13:24:33 +00:00
pmu.h	arm: pmu: allow platform specific irq enable/disable handling	2011-12-02 15:16:33 +00:00
posix_types.h
proc-fns.h	ARM: LPAE: Page table maintenance for the 3-level format	2011-12-08 10:30:39 +00:00
processor.h	ARM: 7169/1: topdown mmap support	2011-12-06 11:15:25 +00:00
procinfo.h
prom.h	irq: add irq_domain translation infrastructure	2011-07-28 01:32:04 -06:00
ptrace.h	ARM: ptrace: Add APSR_MASK definition to ptrace.h	2011-07-13 17:32:43 +00:00
scatterlist.h	ARM: Allow SoCs to enable scatterlist chaining	2011-06-02 11:16:22 +01:00
sched_clock.h	ARM: 7205/2: sched_clock: allow sched_clock to be selected at runtime	2011-12-18 23:00:26 +00:00
seccomp.h
segment.h
sembuf.h
serial.h
setup.h	ARM: Allow Kconfig to control the definition of NR_BANKS	2011-12-13 08:52:02 +00:00
shmbuf.h
shmparam.h
sigcontext.h
signal.h
smp.h	ARM: gic: consolidate PPI handling	2011-10-23 13:32:29 +01:00
smp_plat.h
smp_scu.h
smp_twd.h	ARM: gic, local timers: use the request_percpu_irq() interface	2011-10-23 13:32:33 +01:00
socket.h	net: add wireless TX status socket option	2011-11-09 16:01:02 -05:00
sockios.h
sparsemem.h
spinlock.h	ARM: 6939/1: fix missing 'cpu_relax()' declaration	2011-05-23 17:19:26 +01:00
spinlock_types.h
stackprotector.h
stacktrace.h
stat.h
statfs.h
string.h
suspend.h	ARM: pm: preallocate a page table for suspend/resume	2011-09-20 23:33:36 +01:00
swab.h	ARM: 7173/1: Add optimised swahb32() byteswap helper for v6 and above	2011-12-06 11:15:26 +00:00
system.h	Merge branch 'restart' into for-linus	2012-01-05 13:25:27 +00:00
tcm.h	ARM: 6985/1: export functions to determine the presence of I/DTCM	2011-07-06 20:49:45 +01:00
termbits.h
termios.h
therm.h
thread_info.h
thread_notify.h
timex.h
tlb.h	ARM: LPAE: Invalidate the TLB before freeing the PMD	2011-12-08 10:30:40 +00:00
tlbflush.h	ARM: 7076/1: LPAE: Add (pte|pmd)val_t type definitions as u32	2011-10-06 15:40:05 +01:00
tls.h
topology.h	ARM: 7182/1: ARM cpu topology: fix warning	2011-11-30 23:55:21 +00:00
traps.h	ARM: 7004/1: fix traps.h compile warnings	2011-07-22 17:19:02 +01:00
types.h
uaccess.h
ucontext.h
unaligned.h
unified.h
unistd.h	ARM: wire up process_vm_writev and process_vm_readv syscalls	2011-11-17 16:58:00 +00:00
unwind.h	ARM: 7187/1: fix unwinding for XIP kernels	2011-12-06 11:16:13 +00:00
user.h
vfp.h
vfpmacros.h
vga.h	ARM: set vga memory base at run-time	2011-07-12 11:19:29 -05:00
xor.h