diff options
| author | Olof Johansson <olof@lixom.net> | 2013-05-20 23:47:23 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2013-05-20 23:49:04 -0700 |
| commit | d595f0a0c553434ff2875f2e6d68ca641d3d9f1f (patch) | |
| tree | 65925d04448a484ef70ac1bc22eb002b8beae9e2 /tools/perf/util/scripting-engines/trace-event-python.c | |
| parent | Merge tag 'imx-fixes-3.10' of git://git.linaro.org/people/shawnguo/linux-2.6 ... (diff) | |
| parent | ARM: ux500: select REGULATOR (diff) | |
| download | linux-d595f0a0c553434ff2875f2e6d68ca641d3d9f1f.tar.gz linux-d595f0a0c553434ff2875f2e6d68ca641d3d9f1f.zip | |
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>
Diffstat (limited to 'tools/perf/util/scripting-engines/trace-event-python.c')
0 files changed, 0 insertions, 0 deletions