diff options
| author | Olof Johansson | 2015-01-19 11:40:14 -0800 |
|---|---|---|
| committer | Olof Johansson | 2015-01-19 11:40:14 -0800 |
| commit | 3f0b736a9867ef160c6abd6602cce23686e2a637 (patch) | |
| tree | 387eee167f928bd30582dc82160c00c1517da64e /mm | |
| parent | baf41b32d8d89824d257d52e472f8fd71be18872 (diff) | |
| parent | a1b282911b47a522f150eb715fb037628c5173fe (diff) | |
Merge tag 'at91-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/nferre/linux-at91 into next/defconfig
Merge "at91: defconfig for 3.20 #1" from Nicolas Ferre:
First batch of defconfig update for 3.20:
- we remove DEBUG_LL from sama5 defconfig as all SoC are not compatible
- enable ISI and selected sensors
* tag 'at91-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/nferre/linux-at91:
ARM: at91: sama5: enable atmel-isi and ov2640 in defconfig
ARM: at91/config: sama5: Remove DEBUG_LL
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'mm')
0 files changed, 0 insertions, 0 deletions