diff options
| author |   Olof Johansson <olof@lixom.net> | 2013-09-05 18:01:41 -0700 |
|---|---|---|
| committer |   Linus Torvalds <torvalds@linux-foundation.org> | 2013-09-05 18:07:00 -0700 |
| commit | 356f9e74ffaafd11741589a9aa21d6c9d2721417 (patch) | |
| tree | 46c0479e0a19b1be15e872a5d25182e3f160e274 /tools/perf/scripts/python/call-graph-from-postgresql.py | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide (diff) | |
| download | linux-dev-356f9e74ffaafd11741589a9aa21d6c9d2721417.tar.xz linux-dev-356f9e74ffaafd11741589a9aa21d6c9d2721417.zip | |
net: stmmac: fix bad merge conflict resolution
Merge commit 06c54055bebf did a bad conflict resolution accidentally
leaving out a closing brace. Add it back.
This breaks a handful of defconfigs on ARM, so it'd be good to see it
applied pretty quickly.
Signed-off-by: Olof Johansson <olof@lixom.net>
Cc: David S. Miller <davem@davemloft.net>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'tools/perf/scripts/python/call-graph-from-postgresql.py')
0 files changed, 0 insertions, 0 deletions