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)
|
||
|---|---|---|
| .. | ||
| altera-stapl | ||
| asus_oled | ||
| ath6kl | ||
| bcm | ||
| brcm80211 | ||
| comedi | ||
| cptm1217 | ||
| crystalhd | ||
| cs5535_gpio | ||
| cx25821 | ||
| cxd2099 | ||
| cxt1e1 | ||
| dt3155v4l | ||
| easycap | ||
| echo | ||
| et131x | ||
| frontier | ||
| ft1000 | ||
| generic_serial | ||
| gma500 | ||
| go7007 | ||
| hv | ||
| iio | ||
| intel_sst | ||
| keucr | ||
| line6 | ||
| lirc | ||
| mei | ||
| msm | ||
| nvec | ||
| octeon | ||
| olpc_dcon | ||
| panel | ||
| phison | ||
| pohmelfs | ||
| quatech_usb2 | ||
| quickstart | ||
| rtl8187se | ||
| rtl8192e | ||
| rtl8192u | ||
| rtl8712 | ||
| rts_pstor | ||
| sbe-2t3e3 | ||
| sep | ||
| serqt_usb2 | ||
| slicoss | ||
| sm7xx | ||
| solo6x10 | ||
| speakup | ||
| spectra | ||
| ste_rmi4 | ||
| tidspbridge | ||
| tm6000 | ||
| tty | ||
| usbip | ||
| vme | ||
| vt6655 | ||
| vt6656 | ||
| westbridge | ||
| winbond | ||
| wlags49_h2 | ||
| wlags49_h25 | ||
| wlan-ng | ||
| xgifb | ||
| zcache | ||
| zram | ||
| Kconfig | ||
| Makefile | ||
| staging.c | ||