]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commit
Merge tag 'ux500-arm-soc-v3.10-fixes' of git://git.kernel.org/pub/scm/linux/kernel...
authorOlof Johansson <olof@lixom.net>
Tue, 21 May 2013 06:47:23 +0000 (23:47 -0700)
committerOlof Johansson <olof@lixom.net>
Tue, 21 May 2013 06:49:04 +0000 (23:49 -0700)
commitd595f0a0c553434ff2875f2e6d68ca641d3d9f1f
tree65925d04448a484ef70ac1bc22eb002b8beae9e2
parenta706d8505cce60f6088dbfa33ff075489e89f08d
parent74ba4ec7a2036f9dbe5fcc85c7c737222005507f
Merge tag 'ux500-arm-soc-v3.10-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson into fixes

From Linus Walleij, some ux500 fixes for the v3.10-rc series:
- Fixes up the debug UART
- Fix dangerous platform data double-assignment
- Fix auxdata for the ethernet device
- Select REGULATOR to satisfy Kconfig

* tag 'ux500-arm-soc-v3.10-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson:
  ARM: ux500: select REGULATOR
  ARM: ux500: Provide device enumeration number suffix for SMSC911x
  ARM: ux500: Fix incorrect DEBUG UART virtual addresses
  ARM: ux500: Remove duplicated assignment of ab8500_platdata

Signed-off-by: Olof Johansson <olof@lixom.net>