diff options
author | Arnd Bergmann <arnd@arndb.de> | 2016-05-09 15:41:24 +0200 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2016-05-09 15:41:24 +0200 |
commit | b65b98d9ac27a97a715b076ead50e408026bfbf4 (patch) | |
tree | d16cc2722ed29beb3a429c078dc779412928fcda /net/unix/af_unix.c | |
parent | 2377f9fdac3086c6bb167c83f05ad91fb66d8e9d (diff) | |
parent | 71d42e9c71d7fca2eca98eac315cb485b5d2314d (diff) | |
download | linux-b65b98d9ac27a97a715b076ead50e408026bfbf4.tar.gz linux-b65b98d9ac27a97a715b076ead50e408026bfbf4.tar.bz2 linux-b65b98d9ac27a97a715b076ead50e408026bfbf4.zip |
Merge tag 'lpc32xx-soc-4.7' of git://github.com/vzapolskiy/linux-lpc32xx into next/soc
Merge "NXP LPC32xx mach updates for v4.7" from Vladimir Zapolskiy:
This includes a few nonfunctional clean-ups for NXP LPC32xx:
* removed leftover from restart code migration to a watchdog driver
* removed dead code leftovers from migration to CCF driver
* fix double const qualifier
* tag 'lpc32xx-soc-4.7' of git://github.com/vzapolskiy/linux-lpc32xx:
ARM: lpc32xx: remove duplicate const on lpc32xx_auxdata_lookup
ARM: lpc32xx: remove leftovers of legacy clock source and provider drivers
ARM: lpc32xx: remove reboot header file
Diffstat (limited to 'net/unix/af_unix.c')
0 files changed, 0 insertions, 0 deletions