diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-13 18:31:33 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-13 18:31:33 (GMT) |
| commit | 94b1984ab9ab61cc6047c07e074d766485299a9c (patch) | |
| tree | 4b6cba21caf3d99129bea6a5eba0544b2fe8402a /net/dns_resolver | |
| parent | 1a52bb0b686844021597d190e562ab55d1210104 (diff) | |
| parent | 515315a123af641a9533e4ff0f178c470dc08fc7 (diff) | |
| download | linux-94b1984ab9ab61cc6047c07e074d766485299a9c.tar.xz | |
Merge branch 'linux-next' of git://git.infradead.org/ubifs-2.6
* 'linux-next' of git://git.infradead.org/ubifs-2.6:
UBIFS: fix key printing
UBIFS: use snprintf instead of sprintf when printing keys
UBIFS: fix debugging messages
UBIFS: make debugging messages light again
UBI: fix debugging messages
UBI: make vid_hdr non-static
Diffstat (limited to 'net/dns_resolver')
0 files changed, 0 insertions, 0 deletions