From: Arnd Bergmann <arnd@arndb.de>
Date: Wed, 10 Sep 2014 15:02:37 +0000 (+0200)
Subject: Merge branch 'lpc32xx/defconfig' of git://git.antcom.de/linux-2.6 into next/defconfig
X-Git-Tag: v3.18-rc1~117^2~10
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=e415765f90105a7d2d1b410559520d925444136f;p=users%2Fjedix%2Flinux-maple.git

Merge branch 'lpc32xx/defconfig' of git://git.antcom.de/linux-2.6 into next/defconfig

Pull "ARM: LPC32xx: Device tree updates" from Roland Stigge:

This enables ubifs in the lpc32xx defconfig.

* 'lpc32xx/defconfig' of git://git.antcom.de/linux-2.6:
  ARM: LPC32xx: defconfig update
---

e415765f90105a7d2d1b410559520d925444136f