]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
projects / karo-tx-linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 049e6dd 0a8b069)
Merge tag 'renesas-defconfig-for-v4.4' of git://git.kernel.org/pub/scm/linux/kernel...
authorArnd Bergmann <arnd@arndb.de>
Tue, 6 Oct 2015 14:02:34 +0000 (16:02 +0200)
committerArnd Bergmann <arnd@arndb.de>
Tue, 6 Oct 2015 14:02:34 +0000 (16:02 +0200)
Merge "Renesas ARM Based SoC Defconfig Updates for v4.4" from Simon Horman:

* Remove now non-existent MACH_MARZEN from defconfigs

* tag 'renesas-defconfig-for-v4.4' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
  ARM: multi_v7_defconfig: Remove Marzen
  ARM: shmobile: Remove Marzen from shmobile_defconfig


Trivial merge
Linux kernel for KaRo TX COM modules