summaryrefslogtreecommitdiff
BranchCommit messageAuthorAge
emaclite-cleanupnet: xilinx: emaclite: Remove net_device pointer from struct net_localTobias Klauser7 years
masterMerge tag 'docs-4.10' of git://git.lwn.net/linuxLinus Torvalds7 years
nds-private-removeusbnet: pegasus: Use net_device_stats from struct net_deviceTobias Klauser7 years
packet-loop-backnet: packet: Introduce PACKET_XMIT_RECEIVE socket optionTobias Klauser7 years
packet-rx-pump-backnet: packet: Introduce PACKET_RX_PUMP_BACK socket optionTobias Klauser7 years
 
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-05-20 16:54:45 +0000
3230e8200699860f0b10af524dc47bf8aecad'>0003230e8200699860f0b10af524dc47bf8aecad (diff)parentdf2e301fee3c2c2a87592151397ad7699bb14c37 (diff)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
* '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)
Diffstat