diff options
| author |   Roland Stigge <stigge@antcom.de> | 2012-03-29 00:49:56 +0200 |
|---|---|---|
| committer |   Olof Johansson <olof@lixom.net> | 2012-03-29 10:58:14 -0700 |
| commit | 714daf73d0889c62e90abf4510e4fab65b4668e8 (patch) | |
| tree | 0ae303523768d933218ada96ecceb57c3d1fd74b /tools/perf/util/scripting-engines/trace-event-python.c | |
| parent | Merge tag 'mmc-merge-for-3.4-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc (diff) | |
| download | wireguard-linux-714daf73d0889c62e90abf4510e4fab65b4668e8.tar.xz wireguard-linux-714daf73d0889c62e90abf4510e4fab65b4668e8.zip | |
ARM: LPC32xx: clock.c: Fix lpc-eth clock reference
During a complex merge for v3.4, one line of the commit
c20b909be9ba27173294a52d08cab293ec030a2c ("ARM: LPC32xx: Ethernet support") was
reverted wrongly ("lpc-eth.0" -> "lpc-net.0") while the other conflicts were
merged correctly. This patch re-applies the clock name "lpc-eth.0".
Signed-off-by: Roland Stigge <stigge@antcom.de>
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