commit | 78aed4a63aaa67f22cb1b541dd7528139a24c289 | [log] [tgz] |
---|---|---|
author | Paul Mundt <lethal@linux-sh.org> | Fri Oct 16 18:16:02 2009 +0900 |
committer | Paul Mundt <lethal@linux-sh.org> | Fri Oct 16 18:16:02 2009 +0900 |
tree | 56c0e18d498dee86ec9ff018d6070c8d08443be1 | |
parent | 896f0c0e8e4ee02ee72a203aef79f362d5f7b7cc [diff] | |
parent | f875295c4bfb39e96d136edd8ac80567e73536b4 [diff] |
Merge branch 'sh/stable-updates' Conflicts: arch/sh/Kconfig