mirror of
https://github.com/FEX-Emu/linux.git
synced 2025-01-06 01:09:08 +00:00
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)
|
||
|---|---|---|
| .. | ||
| ac97_codec.h | ||
| aci.h | ||
| ad1816a.h | ||
| ad1843.h | ||
| ak4xxx-adda.h | ||
| ak4113.h | ||
| ak4114.h | ||
| ak4117.h | ||
| ak4531_codec.h | ||
| ak4641.h | ||
| alc5623.h | ||
| asequencer.h | ||
| asound_fm.h | ||
| asound.h | ||
| asoundef.h | ||
| atmel-abdac.h | ||
| atmel-ac97c.h | ||
| control.h | ||
| core.h | ||
| cs46xx_dsp_scb_types.h | ||
| cs46xx_dsp_spos.h | ||
| cs46xx_dsp_task_types.h | ||
| cs46xx.h | ||
| cs4231-regs.h | ||
| cs4271.h | ||
| cs8403.h | ||
| cs8427.h | ||
| emu10k1_synth.h | ||
| emu10k1.h | ||
| emu8000_reg.h | ||
| emu8000.h | ||
| emux_legacy.h | ||
| emux_synth.h | ||
| es1688.h | ||
| gus.h | ||
| hda_hwdep.h | ||
| hdsp.h | ||
| hdspm.h | ||
| hwdep.h | ||
| i2c.h | ||
| info.h | ||
| initval.h | ||
| jack.h | ||
| Kbuild | ||
| l3.h | ||
| max98088.h | ||
| max98095.h | ||
| memalloc.h | ||
| minors.h | ||
| mixer_oss.h | ||
| mpu401.h | ||
| opl3.h | ||
| opl4.h | ||
| pcm_oss.h | ||
| pcm_params.h | ||
| pcm-indirect.h | ||
| pcm.h | ||
| pt2258.h | ||
| pxa2xx-lib.h | ||
| rawmidi.h | ||
| s3c24xx_uda134x.h | ||
| sb16_csp.h | ||
| sb.h | ||
| seq_device.h | ||
| seq_kernel.h | ||
| seq_midi_emul.h | ||
| seq_midi_event.h | ||
| seq_oss_legacy.h | ||
| seq_oss.h | ||
| seq_virmidi.h | ||
| sfnt_info.h | ||
| sh_dac_audio.h | ||
| sh_fsi.h | ||
| snd_wavefront.h | ||
| soc-dai.h | ||
| soc-dapm.h | ||
| soc.h | ||
| soundfont.h | ||
| tea575x-tuner.h | ||
| tea6330t.h | ||
| timer.h | ||
| tlv320aic3x.h | ||
| tlv320aic32x4.h | ||
| tlv320dac33-plat.h | ||
| tlv.h | ||
| tpa6130a2-plat.h | ||
| trident.h | ||
| uda134x.h | ||
| uda1380.h | ||
| util_mem.h | ||
| version.h | ||
| vx_core.h | ||
| wavefront.h | ||
| wm2000.h | ||
| wm8903.h | ||
| wm8904.h | ||
| wm8915.h | ||
| wm8955.h | ||
| wm8960.h | ||
| wm8962.h | ||
| wm8993.h | ||
| wm9081.h | ||
| wm9090.h | ||
| wss.h | ||
| ymfpci.h | ||