mirror of
https://github.com/torvalds/linux.git
synced 2024-11-01 09:41:44 +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)
|
||
|---|---|---|
| .. | ||
| include/mach | ||
| board-ag5evm.c | ||
| board-ap4evb.c | ||
| board-g3evm.c | ||
| board-g4evm.c | ||
| board-mackerel.c | ||
| clock-sh73a0.c | ||
| clock-sh7367.c | ||
| clock-sh7372.c | ||
| clock-sh7377.c | ||
| clock.c | ||
| console.c | ||
| cpuidle.c | ||
| entry-gic.S | ||
| entry-intc.S | ||
| headsmp.S | ||
| hotplug.c | ||
| intc-sh73a0.c | ||
| intc-sh7367.c | ||
| intc-sh7372.c | ||
| intc-sh7377.c | ||
| Kconfig | ||
| localtimer.c | ||
| Makefile | ||
| Makefile.boot | ||
| pfc-sh73a0.c | ||
| pfc-sh7367.c | ||
| pfc-sh7372.c | ||
| pfc-sh7377.c | ||
| platsmp.c | ||
| pm_runtime.c | ||
| pm-sh7372.c | ||
| setup-sh73a0.c | ||
| setup-sh7367.c | ||
| setup-sh7372.c | ||
| setup-sh7377.c | ||
| sleep-sh7372.S | ||
| smp-sh73a0.c | ||
| suspend.c | ||
| timer.c | ||