summaryrefslogtreecommitdiff
path: root/net/6lowpan/nhc.h
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2016-07-07 13:41:13 (GMT)
committerThomas Gleixner <tglx@linutronix.de>2016-07-07 13:41:13 (GMT)
commit3d93f42d449ace8e2dd8e2ec9790fdce31a14c9c (patch)
tree16abfc89c51a2cf0116eb692a591faf897e04297 /net/6lowpan/nhc.h
parent4b4b20852d1009c5e8bc357b22353b62e3a241c7 (diff)
parent34c720a915857f168b98ab03f97b33784286e4ad (diff)
downloadlinux-3d93f42d449ace8e2dd8e2ec9790fdce31a14c9c.tar.xz
Merge branch 'clockevents/4.8' of http://git.linaro.org/people/daniel.lezcano/linux into timers/core
Pull the clockevents/clocksource tree from Daniel Lezcano: - Convert the clocksource-probe init functions to return a value in order to prepare the consolidation of the drivers using the DT. It is a big patchset but went through 01.org (kbuild bot), linux next and kernel-ci (continuous integration) (Daniel Lezcano) - Fix a bad error handling by returning the right value for cadence_ttc (Christophe Jaillet) - Fix typo in the Kconfig for the Samsung pwm (Alexandre Belloni) - Change functions to static for armada-370-xp and digicolor (Ben Dooks) - Add support for the rk3399 SoC timer by adding bindings and a slight change in the base address. Take the opportunity to add the DYNIRQ flag (Huang Tao) - Fix endian accessors for the Samsung pwm timer (Matthew Leach) - Add Oxford Semiconductor RPS Dual Timer driver (Neil Armstrong) - Add a kernel parameter to swich on/off the event stream feature of the arch arm timer (Will Deacon)
Diffstat (limited to 'net/6lowpan/nhc.h')
0 files changed, 0 insertions, 0 deletions