| commit | b9afa3e015273a52718e0a7efe198a0df76be880 | [log] [tgz] |
|---|---|---|
| author | Paul Mundt <lethal@linux-sh.org> | Fri Aug 20 20:52:23 2010 +0900 |
| committer | Paul Mundt <lethal@linux-sh.org> | Fri Aug 20 20:52:23 2010 +0900 |
| tree | 88cf67276533fcd5622d4cc2165ba889a98bb0db | |
| parent | 144c7494239f12d554806439a17ad8203c7b2d3a [diff] | |
| parent | 763008c4357b73c8d18396dfd8d79dc58fa3f99d [diff] |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 Conflicts: arch/sh/kernel/process_32.c Signed-off-by: Paul Mundt <lethal@linux-sh.org>