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)
|
||
|---|---|---|
| .. | ||
| act200l-sir.c | ||
| actisys-sir.c | ||
| ali-ircc.c | ||
| ali-ircc.h | ||
| au1k_ir.c | ||
| au1000_ircc.h | ||
| bfin_sir.c | ||
| bfin_sir.h | ||
| donauboe.c | ||
| donauboe.h | ||
| ep7211-sir.c | ||
| esi-sir.c | ||
| girbil-sir.c | ||
| irda-usb.c | ||
| irda-usb.h | ||
| irtty-sir.c | ||
| irtty-sir.h | ||
| Kconfig | ||
| kingsun-sir.c | ||
| ks959-sir.c | ||
| ksdazzle-sir.c | ||
| litelink-sir.c | ||
| ma600-sir.c | ||
| Makefile | ||
| mcp2120-sir.c | ||
| mcs7780.c | ||
| mcs7780.h | ||
| nsc-ircc.c | ||
| nsc-ircc.h | ||
| old_belkin-sir.c | ||
| pxaficp_ir.c | ||
| sa1100_ir.c | ||
| sh_irda.c | ||
| sh_sir.c | ||
| sir_dev.c | ||
| sir_dongle.c | ||
| sir-dev.h | ||
| smsc-ircc2.c | ||
| smsc-ircc2.h | ||
| smsc-sio.h | ||
| stir4200.c | ||
| tekram-sir.c | ||
| toim3232-sir.c | ||
| via-ircc.c | ||
| via-ircc.h | ||
| vlsi_ir.c | ||
| vlsi_ir.h | ||
| w83977af_ir.c | ||
| w83977af_ir.h | ||
| w83977af.h | ||