Merge tag 'ux500-defconfig-v3.10' of git://git.kernel.org/pub/scm/linux/kernel/git...

Merge tag 'ux500-defconfig-v3.10' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson into next/soc

From Linus Walleij <linus.walleij@linaro.org>:

Defconfig updates for ux500:
- Turn on the "heartbeat" LED trigger used by Snowball
- Enable the EXT4_FS and LBDAF by default

* tag 'ux500-defconfig-v3.10' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson:
  ARM: ux500: enable ux500 EXT4_FS and LBDAF support by default
  ARM: ux500: Turn on the 'heartbeat' LED trigger

Signed-off-by: Arnd Bergmann <arnd@arndb.de>