diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2008-10-20 04:37:58 +0200 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2008-10-20 04:37:58 +0200 |
| commit | 9a19eb2a6607f2f6329efb3c4637fe23afae2cd7 (patch) | |
| tree | c730bca14d2c6ea8b5e8778e15bd1c219c554d4b /scripts | |
| parent | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torval... (diff) | |
| download | linux-9a19eb2a6607f2f6329efb3c4637fe23afae2cd7.tar.xz linux-9a19eb2a6607f2f6329efb3c4637fe23afae2cd7.zip | |
sh: Fix up some merge damage.
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'scripts')
0 files changed, 0 insertions, 0 deletions