forked from luck/tmp_suning_uos_patched
d3ec4844d4
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (43 commits)
fs: Merge split strings
treewide: fix potentially dangerous trailing ';' in #defined values/expressions
uwb: Fix misspelling of neighbourhood in comment
net, netfilter: Remove redundant goto in ebt_ulog_packet
trivial: don't touch files that are removed in the staging tree
lib/vsprintf: replace link to Draft by final RFC number
doc: Kconfig: `to be' -> `be'
doc: Kconfig: Typo: square -> squared
doc: Konfig: Documentation/power/{pm => apm-acpi}.txt
drivers/net: static should be at beginning of declaration
drivers/media: static should be at beginning of declaration
drivers/i2c: static should be at beginning of declaration
XTENSA: static should be at beginning of declaration
SH: static should be at beginning of declaration
MIPS: static should be at beginning of declaration
ARM: static should be at beginning of declaration
rcu: treewide: Do not use rcu_read_lock_held when calling rcu_dereference_check
Update my e-mail address
PCIe ASPM: forcedly -> forcibly
gma500: push through device driver tree
...
Fix up trivial conflicts:
- arch/arm/mach-ep93xx/dma-m2p.c (deleted)
- drivers/gpio/gpio-ep93xx.c (renamed and context nearby)
- drivers/net/r8169.c (just context changes)
|
||
|---|---|---|
| .. | ||
| acpi | ||
| apic | ||
| cpu | ||
| .gitignore | ||
| alternative.c | ||
| amd_gart_64.c | ||
| amd_nb.c | ||
| apb_timer.c | ||
| aperture_64.c | ||
| apm_32.c | ||
| asm-offsets_32.c | ||
| asm-offsets_64.c | ||
| asm-offsets.c | ||
| audit_64.c | ||
| bootflag.c | ||
| check.c | ||
| cpuid.c | ||
| crash_dump_32.c | ||
| crash_dump_64.c | ||
| crash.c | ||
| devicetree.c | ||
| doublefault_32.c | ||
| dumpstack_32.c | ||
| dumpstack_64.c | ||
| dumpstack.c | ||
| e820.c | ||
| early_printk.c | ||
| early-quirks.c | ||
| entry_32.S | ||
| entry_64.S | ||
| ftrace.c | ||
| head32.c | ||
| head64.c | ||
| head_32.S | ||
| head_64.S | ||
| head.c | ||
| hpet.c | ||
| hw_breakpoint.c | ||
| i386_ksyms_32.c | ||
| i387.c | ||
| i8237.c | ||
| i8253.c | ||
| i8259.c | ||
| init_task.c | ||
| io_delay.c | ||
| ioport.c | ||
| irq_32.c | ||
| irq_64.c | ||
| irq_work.c | ||
| irq.c | ||
| irqinit.c | ||
| jump_label.c | ||
| kdebugfs.c | ||
| kgdb.c | ||
| kprobes.c | ||
| kvm.c | ||
| kvmclock.c | ||
| ldt.c | ||
| machine_kexec_32.c | ||
| machine_kexec_64.c | ||
| Makefile | ||
| mca_32.c | ||
| microcode_amd.c | ||
| microcode_core.c | ||
| microcode_intel.c | ||
| mmconf-fam10h_64.c | ||
| module.c | ||
| mpparse.c | ||
| msr.c | ||
| paravirt_patch_32.c | ||
| paravirt_patch_64.c | ||
| paravirt-spinlocks.c | ||
| paravirt.c | ||
| pci-calgary_64.c | ||
| pci-dma.c | ||
| pci-iommu_table.c | ||
| pci-nommu.c | ||
| pci-swiotlb.c | ||
| pcspeaker.c | ||
| probe_roms.c | ||
| process_32.c | ||
| process_64.c | ||
| process.c | ||
| ptrace.c | ||
| pvclock.c | ||
| quirks.c | ||
| reboot_32.S | ||
| reboot_fixups_32.c | ||
| reboot.c | ||
| relocate_kernel_32.S | ||
| relocate_kernel_64.S | ||
| resource.c | ||
| rtc.c | ||
| setup_percpu.c | ||
| setup.c | ||
| signal.c | ||
| smp.c | ||
| smpboot.c | ||
| stacktrace.c | ||
| step.c | ||
| sys_i386_32.c | ||
| sys_x86_64.c | ||
| syscall_64.c | ||
| syscall_table_32.S | ||
| tboot.c | ||
| tce_64.c | ||
| test_nx.c | ||
| test_rodata.c | ||
| time.c | ||
| tls.c | ||
| tls.h | ||
| topology.c | ||
| trampoline_32.S | ||
| trampoline_64.S | ||
| trampoline.c | ||
| traps.c | ||
| tsc_sync.c | ||
| tsc.c | ||
| verify_cpu.S | ||
| vm86_32.c | ||
| vmlinux.lds.S | ||
| vsmp_64.c | ||
| vsyscall_64.c | ||
| vsyscall_emu_64.S | ||
| x86_init.c | ||
| x8664_ksyms_64.c | ||
| xsave.c | ||