mirror of
https://github.com/FEX-Emu/linux.git
synced 2024-12-27 11:55:53 +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)
|
||
|---|---|---|
| .. | ||
| at91_cf.c | ||
| au1000_generic.c | ||
| au1000_generic.h | ||
| au1000_pb1x00.c | ||
| bcm63xx_pcmcia.c | ||
| bcm63xx_pcmcia.h | ||
| bfin_cf_pcmcia.c | ||
| cardbus.c | ||
| cirrus.h | ||
| cistpl.c | ||
| cs_internal.h | ||
| cs.c | ||
| db1xxx_ss.c | ||
| ds.c | ||
| electra_cf.c | ||
| i82092.c | ||
| i82092aa.h | ||
| i82365.c | ||
| i82365.h | ||
| Kconfig | ||
| m8xx_pcmcia.c | ||
| m32r_cfc.c | ||
| m32r_cfc.h | ||
| m32r_pcc.c | ||
| m32r_pcc.h | ||
| Makefile | ||
| o2micro.h | ||
| omap_cf.c | ||
| pcmcia_cis.c | ||
| pcmcia_resource.c | ||
| pd6729.c | ||
| pd6729.h | ||
| pxa2xx_balloon3.c | ||
| pxa2xx_base.c | ||
| pxa2xx_base.h | ||
| pxa2xx_cm_x2xx.c | ||
| pxa2xx_cm_x255.c | ||
| pxa2xx_cm_x270.c | ||
| pxa2xx_colibri.c | ||
| pxa2xx_e740.c | ||
| pxa2xx_lubbock.c | ||
| pxa2xx_mainstone.c | ||
| pxa2xx_palmld.c | ||
| pxa2xx_palmtc.c | ||
| pxa2xx_palmtx.c | ||
| pxa2xx_sharpsl.c | ||
| pxa2xx_stargate2.c | ||
| pxa2xx_trizeps4.c | ||
| pxa2xx_viper.c | ||
| pxa2xx_vpac270.c | ||
| ricoh.h | ||
| rsrc_iodyn.c | ||
| rsrc_mgr.c | ||
| rsrc_nonstatic.c | ||
| sa11xx_base.c | ||
| sa11xx_base.h | ||
| sa1100_assabet.c | ||
| sa1100_badge4.c | ||
| sa1100_cerf.c | ||
| sa1100_generic.c | ||
| sa1100_generic.h | ||
| sa1100_h3600.c | ||
| sa1100_jornada720.c | ||
| sa1100_nanoengine.c | ||
| sa1100_neponset.c | ||
| sa1100_shannon.c | ||
| sa1100_simpad.c | ||
| sa1111_generic.c | ||
| sa1111_generic.h | ||
| soc_common.c | ||
| soc_common.h | ||
| socket_sysfs.c | ||
| tcic.c | ||
| tcic.h | ||
| ti113x.h | ||
| topic.h | ||
| vg468.h | ||
| vrc4171_card.c | ||
| vrc4173_cardu.c | ||
| vrc4173_cardu.h | ||
| xxs1500_ss.c | ||
| yenta_socket.c | ||
| yenta_socket.h | ||