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)
|
||
|---|---|---|
| .. | ||
| ab8500 | ||
| pcf50633 | ||
| pm8xxx | ||
| wm831x | ||
| wm8350 | ||
| wm8994 | ||
| 88pm860x.h | ||
| ab8500.h | ||
| abx500.h | ||
| adp5520.h | ||
| asic3.h | ||
| core.h | ||
| da903x.h | ||
| davinci_voicecodec.h | ||
| db5500-prcmu.h | ||
| db8500-prcmu.h | ||
| ds1wm.h | ||
| ezx-pcap.h | ||
| htc-egpio.h | ||
| htc-pasic3.h | ||
| janz.h | ||
| max8925.h | ||
| max8997-private.h | ||
| max8997.h | ||
| max8998-private.h | ||
| max8998.h | ||
| mc13xxx.h | ||
| mc13783.h | ||
| mc13892.h | ||
| mcp.h | ||
| rdc321x.h | ||
| stmpe.h | ||
| t7l66xb.h | ||
| tc3589x.h | ||
| tc6387xb.h | ||
| tc6393xb.h | ||
| ti_ssp.h | ||
| tmio.h | ||
| tps6105x.h | ||
| tps6507x.h | ||
| tps6586x.h | ||
| tps65910.h | ||
| twl4030-codec.h | ||
| ucb1x00.h | ||
| wl1273-core.h | ||
| wm8400-audio.h | ||
| wm8400-private.h | ||
| wm8400.h | ||