diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2016-05-17 15:06:31 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2016-05-17 15:06:31 +0200 |
| commit | 2e629ebc24d463ffb6c17b15daf908e6f968a1de (patch) | |
| tree | 49c44ffee62d06955bff6c928b5d349078f3a12c /net/ipv4/af_inet.c | |
| parent | ARM: debug: remove extraneous DEBUG_HI3716_UART option (diff) | |
| parent | Merge tag 'omap-for-v4.7/auxdata-signed' of git://git.kernel.org/pub/scm/linu... (diff) | |
| download | linux-2e629ebc24d463ffb6c17b15daf908e6f968a1de.tar.xz linux-2e629ebc24d463ffb6c17b15daf908e6f968a1de.zip | |
Merge branches 'next/cleanup' and 'next/fixes-non-critical' into next/cleanups-fixes
This is a merge of the cleanup and fixes-non-critical branches for the 4.7
merge window. It seems more appropriate to send a single pull request
for these than two separate ones, as both branches really contain both
fixes and cleanups.
* next/cleanup:
ARM: debug: remove extraneous DEBUG_HI3716_UART option
ARM: davinci: use IRQCHIP_DECLARE for cp_intc
ARM: davinci: remove unused DA8XX_NUM_UARTS
ARM: davinci: simplify call to of populate
ARM: DaVinci USB: removed deprecated properties from MUSB config
ARM: rockchip: Fix use of plain integer as NULL pointer
ARM: realview: hide unused 'pmu_device' object
soc: versatile: dynamically detect RealView HBI numbers
* next/fixes-non-critical:
ARM: dts: exynos: Add interrupt line to MAX8997 PMIC on exynos4210-trats
ARM: dts: exynos: Fix regulator name to avoid forbidden character on exynos4210-trats
ARM: dts: exynos: Add MFC memory banks for Peach boards
ARM: OMAP2+: n900 needs MMC slot names for legacy user space
ARM: OMAP2+: Add more functions to pwm pdata for ir-rx51
ARM: EXYNOS: Properly skip unitialized parent clock in power domain on
ARM: OMAP2+: Simplify auxdata by using the generic match
of/platform: Allow secondary compatible match in of_dev_lookup
Diffstat (limited to 'net/ipv4/af_inet.c')
0 files changed, 0 insertions, 0 deletions