diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2013-09-16 15:36:55 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-09-16 15:36:55 -0400 |
| commit | 098e7f1665f1a3503524bdd537499e45ad30e67d (patch) | |
| tree | fe8e6ad6882bc9805ca78459f85d11309c9dc205 /tools/perf/util/scripting-engines/trace-event-python.c | |
| parent | Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus (diff) | |
| parent | UBIFS: remove invalid warn msg with tst_recovery enabled (diff) | |
| download | wireguard-linux-098e7f1665f1a3503524bdd537499e45ad30e67d.tar.xz wireguard-linux-098e7f1665f1a3503524bdd537499e45ad30e67d.zip | |
Merge tag 'upstream-3.12-rc1' of git://git.infradead.org/linux-ubifs
Pull ubifs fix from Artem Bityutskiy:
"Just one patch which fixes the power-cut recovery testing mode.
I'll start using a single UBI/UBIFS tree instead of 2 trees from now
on. So in the future you'll get 1 small pull request instead of 2
tiny ones"
* tag 'upstream-3.12-rc1' of git://git.infradead.org/linux-ubifs:
UBIFS: remove invalid warn msg with tst_recovery enabled
Diffstat (limited to 'tools/perf/util/scripting-engines/trace-event-python.c')
0 files changed, 0 insertions, 0 deletions