forked from luck/tmp_suning_uos_patched
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)
|
||
|---|---|---|
| .. | ||
| lpfc_attr.c | ||
| lpfc_bsg.c | ||
| lpfc_bsg.h | ||
| lpfc_compat.h | ||
| lpfc_crtn.h | ||
| lpfc_ct.c | ||
| lpfc_debugfs.c | ||
| lpfc_debugfs.h | ||
| lpfc_disc.h | ||
| lpfc_els.c | ||
| lpfc_hbadisc.c | ||
| lpfc_hw4.h | ||
| lpfc_hw.h | ||
| lpfc_init.c | ||
| lpfc_logmsg.h | ||
| lpfc_mbox.c | ||
| lpfc_mem.c | ||
| lpfc_nl.h | ||
| lpfc_nportdisc.c | ||
| lpfc_scsi.c | ||
| lpfc_scsi.h | ||
| lpfc_sli4.h | ||
| lpfc_sli.c | ||
| lpfc_sli.h | ||
| lpfc_version.h | ||
| lpfc_vport.c | ||
| lpfc_vport.h | ||
| lpfc.h | ||
| Makefile | ||