summaryrefslogtreecommitdiff
path: root/geoip.conf
diff options
context:
space:
mode:
Diffstat (limited to 'geoip.conf')
0 files changed, 0 insertions, 0 deletions
cedc1e02001825f7&id2=2cbb21d749efb9ca1eef04f04d189d4961b33b79'>diff)parentf0d523668cb122905a541cb6b86e3ae49260ae5e (diff)
Merge tag 'at91-defconfig2' of git://git.kernel.org/pub/scm/linux/kernel/git/nferre/linux-at91 into next/defconfig
Merge "Second batch of defconfig" from Nicolas Ferre: - sama5_defconfig: update to support easy use of systemd userspace * tag 'at91-defconfig2' of git://git.kernel.org/pub/scm/linux/kernel/git/nferre/linux-at91: ARM: at91/defconfig: sama5: add CONFIG_FHANDLE ARM: at91: sama5: Update defconfig ARM: multi_v7_defconfig: add the Atmel sama5d2-compatible ADC driver ARM: multi_v7_defconfig: add the Atmel Audio microphone interface PDMIC ARM: multi_v7_defconfig: add Atmel ISI (Image Sensor Interface) driver ARM: multi_v7_defconfig: add Atmel watchdog timers ARM: multi_v7_defconfig: add HLCDC drivers as modules ARM: at91/defconfig: add PDMIC driver to sama5_defconfig ARM: at91/defconfig: add HLCDC driver to sama5_defconfig ARM: at91/defconfig: add the HDMA controller to sama5_defconfig
Diffstat