]> git.proxmox.com Git - mirror_ubuntu-artful-kernel.git/commit
Merge tag 'at91-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/nferre...
authorOlof Johansson <olof@lixom.net>
Tue, 22 Dec 2015 19:47:27 +0000 (11:47 -0800)
committerOlof Johansson <olof@lixom.net>
Tue, 22 Dec 2015 19:47:27 +0000 (11:47 -0800)
commit0b71b62802004bfef8a450060d48f8e8fcc07ed3
tree08c6d9a931bbd8a17cf4716b5a8cc3171bbc81e6
parent1c5a9b84a16420700a07956c3485f91be48799ce
parent94c2317cf46a9c137650bf30f2aba7271886c0b4
Merge tag 'at91-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/nferre/linux-at91 into next/defconfig

First defconfig pull-request for 4.5:
- a single patch to add watchdog drivers to sama5_defconfig

* tag 'at91-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/nferre/linux-at91:
  ARM: at91/defconfig: enable watchdog drivers in sama5_defconfig

Signed-off-by: Olof Johansson <olof@lixom.net>