mirror of
https://github.com/torvalds/linux.git
synced 2024-12-25 04:11:49 +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)
|
||
|---|---|---|
| .. | ||
| ak4xxx.c | ||
| amp.c | ||
| amp.h | ||
| aureon.c | ||
| aureon.h | ||
| delta.c | ||
| delta.h | ||
| envy24ht.h | ||
| ews.c | ||
| ews.h | ||
| hoontech.c | ||
| hoontech.h | ||
| ice1712.c | ||
| ice1712.h | ||
| ice1724.c | ||
| juli.c | ||
| juli.h | ||
| Makefile | ||
| maya44.c | ||
| maya44.h | ||
| phase.c | ||
| phase.h | ||
| pontis.c | ||
| pontis.h | ||
| prodigy192.c | ||
| prodigy192.h | ||
| prodigy_hifi.c | ||
| prodigy_hifi.h | ||
| quartet.c | ||
| quartet.h | ||
| revo.c | ||
| revo.h | ||
| se.c | ||
| se.h | ||
| stac946x.h | ||
| vt1720_mobo.c | ||
| vt1720_mobo.h | ||
| wtm.c | ||
| wtm.h | ||