Merge tag 'ux500-defconfig-for-arm-soc' of git://git.kernel.org/pub/scm/linux/kernel...
authorArnd Bergmann <arnd@arndb.de>
Thu, 24 Apr 2014 13:35:14 +0000 (15:35 +0200)
committerArnd Bergmann <arnd@arndb.de>
Thu, 24 Apr 2014 13:35:14 +0000 (15:35 +0200)
commit072c8b3fe2017c2cb342d6fe6b57063ab48f8bad
treee45adf076cd223501821e4cc3e8d76899475722e
parent6e1ae422c35d7b2274351dcf170fedd799f73288
parent1fb4e407b520a2344b92a680c75672c7900aedf8
Merge tag 'ux500-defconfig-for-arm-soc' of git://git./linux/kernel/git/linusw/linux-stericsson into fixes

This is a patch set for some ST-Ericsson devices:
- Updates the Ux500 (U8500) defconfig
- Selects PARTITION_ADVANCED for Ux500 and U300
- Configure in IIO sensor drivers for the Ux500
- Configure in the CW1200 WLAN chip for the Ux500

* tag 'ux500-defconfig-for-arm-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson:
  ARM: ux500: configure for CW1200 WLAN chip
  ARM: ux500: configure in sensors
  ARM: u300: u300_defconfig: Enable PARTITION_ADVANCED
  ARM: ux500: u8500_defconfig: Enable PARTITION_ADVANCED
  ARM: ux500: update defconfig

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