diff options
| author | Olof Johansson <olof@lixom.net> | 2013-10-07 10:47:34 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2013-10-07 10:47:34 -0700 |
| commit | 933b4f0f34b1e04019477c913a9ddbae705f3de9 (patch) | |
| tree | b6516cf51c7ac1ac8d818e5236f8c0c967e1c68c /tools/perf/scripts/python/net_dropmonitor.py | |
| parent | 07d8a49c263c89c21d1e10b5550706ed8a58eb5e (diff) | |
| parent | 40fca03cae59cfd9b87142ca327abb8a4d386908 (diff) | |
Merge tag 'renesas-fixes5-for-v3.12' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/cleanup
From Simon Horman:
* Correct incorrect placement of __initdata tag in ape6evm board code
* tag 'renesas-fixes5-for-v3.12' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
ARM: shmobile: ape6evm: fix incorrect placement of __initdata tag
(+ other patches already present in v3.12-rc4)
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'tools/perf/scripts/python/net_dropmonitor.py')
0 files changed, 0 insertions, 0 deletions