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)
|
||
|---|---|---|
| .. | ||
| isdn_audio.c | ||
| isdn_audio.h | ||
| isdn_bsdcomp.c | ||
| isdn_common.c | ||
| isdn_common.h | ||
| isdn_concap.c | ||
| isdn_concap.h | ||
| isdn_net.c | ||
| isdn_net.h | ||
| isdn_ppp.c | ||
| isdn_ppp.h | ||
| isdn_tty.c | ||
| isdn_tty.h | ||
| isdn_ttyfax.c | ||
| isdn_ttyfax.h | ||
| isdn_v110.c | ||
| isdn_v110.h | ||
| isdn_x25iface.c | ||
| isdn_x25iface.h | ||
| isdnhdlc.c | ||
| Kconfig | ||
| Makefile | ||