mirror of
https://github.com/torvalds/linux.git
synced 2024-11-15 16:41:58 +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)
|
||
|---|---|---|
| .. | ||
| iwl-1000.c | ||
| iwl-2000.c | ||
| iwl-5000-hw.h | ||
| iwl-5000.c | ||
| iwl-6000-hw.h | ||
| iwl-6000.c | ||
| iwl-agn-calib.c | ||
| iwl-agn-calib.h | ||
| iwl-agn-eeprom.c | ||
| iwl-agn-hw.h | ||
| iwl-agn-lib.c | ||
| iwl-agn-rs.c | ||
| iwl-agn-rs.h | ||
| iwl-agn-rxon.c | ||
| iwl-agn-sta.c | ||
| iwl-agn-tt.c | ||
| iwl-agn-tt.h | ||
| iwl-agn-tx.c | ||
| iwl-agn-ucode.c | ||
| iwl-agn.c | ||
| iwl-agn.h | ||
| iwl-bus.h | ||
| iwl-commands.h | ||
| iwl-core.c | ||
| iwl-core.h | ||
| iwl-csr.h | ||
| iwl-debug.h | ||
| iwl-debugfs.c | ||
| iwl-dev.h | ||
| iwl-devtrace.c | ||
| iwl-devtrace.h | ||
| iwl-eeprom.c | ||
| iwl-eeprom.h | ||
| iwl-fh.h | ||
| iwl-helpers.h | ||
| iwl-io.c | ||
| iwl-io.h | ||
| iwl-led.c | ||
| iwl-led.h | ||
| iwl-pci.c | ||
| iwl-power.c | ||
| iwl-power.h | ||
| iwl-prph.h | ||
| iwl-rx.c | ||
| iwl-scan.c | ||
| iwl-sta.c | ||
| iwl-sta.h | ||
| iwl-sv-open.c | ||
| iwl-testmode.h | ||
| iwl-trans-int-pcie.h | ||
| iwl-trans-rx-pcie.c | ||
| iwl-trans-tx-pcie.c | ||
| iwl-trans.c | ||
| iwl-trans.h | ||
| Kconfig | ||
| Makefile | ||