| commit | ef4ed97d6bd91aa41907181e80a7feaf2721719a | [log] [tgz] |
|---|---|---|
| author | Paul Mundt <lethal@linux-sh.org> | Thu May 13 17:48:05 2010 +0900 |
| committer | Paul Mundt <lethal@linux-sh.org> | Thu May 13 17:48:05 2010 +0900 |
| tree | adc44e858c150c41ebf1dd7c6ee2f6bcbac75502 | |
| parent | c5eb5b372e7ea18a5eeb6b5192a6369967cb1afe [diff] | |
| parent | 21823259a70b7a2a21eea1d48c25a6f38896dd11 [diff] |
Merge branch 'sh/lmb' Conflicts: arch/sh/kernel/setup.c