diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2016-04-29 00:05:07 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2016-04-29 00:05:07 +0200 |
| commit | 94a92cca9bf3db9d6ddd4557477e4e197cafe568 (patch) | |
| tree | ae8d4ba0851f0e6dd82326a041a247a1343c9030 /tools/perf/scripts/python/net_dropmonitor.py | |
| parent | 0d922f441dadf054ad707c6000ce0797d291fb52 (diff) | |
| parent | 22292b91ee1a72ce744a2bd1b0f490ffc766f0dd (diff) | |
Merge tag 'omap-for-v4.7/soc-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/soc
Merge "SoC related changes for omaps for v4.7 merge window" from Tony Lindgren:
- Remove now unnecessary multi vs single SoC compile time optimizations
as we are now using multiarch
- Configure dra7 powerdomains
- Clarify why omap-wakeupgen does not need to handle FROZEN transitions
- Add dra7 module configuration for MaASP, PWMSS and timer 12
- Add RTC module configuration unlock and lock functions
- Fix hwmod idle state sanity check sequence
* tag 'omap-for-v4.7/soc-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
ARM: OMAP2+: wakeupgen: Add comment for unhandled FROZEN transitions
ARM: OMAP: DRA7: powerdomain data: Remove wrong OSWR capability
ARM: OMAP: DRA7: powerdomain data: Fix "ON" state for memories
ARM: OMAP: DRA7: powerdomain data: Erratum i892 workaround: Disable core INA
ARM: OMAP2+: remove redundant multiplatform checks
ARM: OMAP2+: hwmod: fix _idle() hwmod state sanity check sequence
ARM: DRA7: hwmod: Add data for GPTimer 12
ARM: AMx3xx: RTC: Add lock and unlock functions
ARM: DRA7: RTC: Add lock and unlock functions
ARM: OMAP2+: hwmod: RTC: Add lock and unlock functions
ARM: OMAP2+: DRA7: Add hwmod entries for PWMSS
ARM: DRA7: hwmod: Add data for McASP1/2/4/5/6/7/8
ARM: DRA7: clockdomain: Implement timer workaround for errata i874
ARM: OMAP2+: hwmod: Fix updating of sysconfig register
Diffstat (limited to 'tools/perf/scripts/python/net_dropmonitor.py')
0 files changed, 0 insertions, 0 deletions