forked from Minki/linux
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)
|
||
|---|---|---|
| .. | ||
| gpio-74x164.c | ||
| gpio-ab8500.c | ||
| gpio-adp5520.c | ||
| gpio-adp5588.c | ||
| gpio-bt8xx.c | ||
| gpio-cs5535.c | ||
| gpio-da9052.c | ||
| gpio-ep93xx.c | ||
| gpio-exynos4.c | ||
| gpio-generic.c | ||
| gpio-it8761e.c | ||
| gpio-janz-ttl.c | ||
| gpio-langwell.c | ||
| gpio-max730x.c | ||
| gpio-max732x.c | ||
| gpio-max7300.c | ||
| gpio-max7301.c | ||
| gpio-mc33880.c | ||
| gpio-mcp23s08.c | ||
| gpio-ml-ioh.c | ||
| gpio-mpc5200.c | ||
| gpio-mxc.c | ||
| gpio-mxs.c | ||
| gpio-nomadik.c | ||
| gpio-omap.c | ||
| gpio-pca953x.c | ||
| gpio-pcf857x.c | ||
| gpio-pch.c | ||
| gpio-pl061.c | ||
| gpio-plat-samsung.c | ||
| gpio-rdc321x.c | ||
| gpio-s5pc100.c | ||
| gpio-s5pv210.c | ||
| gpio-sch.c | ||
| gpio-stmpe.c | ||
| gpio-sx150x.c | ||
| gpio-tc3589x.c | ||
| gpio-tegra.c | ||
| gpio-timberdale.c | ||
| gpio-tps65910.c | ||
| gpio-twl4030.c | ||
| gpio-u300.c | ||
| gpio-ucb1400.c | ||
| gpio-vr41xx.c | ||
| gpio-vx855.c | ||
| gpio-wm831x.c | ||
| gpio-wm8350.c | ||
| gpio-wm8994.c | ||
| gpio-xilinx.c | ||
| gpiolib.c | ||
| Kconfig | ||
| Makefile | ||