diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2008-10-28 19:44:15 +0900 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2008-10-28 19:44:15 +0900 |
| commit | 86d758ef2cb0677b471a88ffe33a29cdfec4ceca (patch) | |
| tree | 6c0af4aee6b29fc426faecf827f768ec98b3b00b /arch/um | |
| parent | b2d86a3fd9855380598c0c039e712a20086e119f (diff) | |
| parent | 15c73aaa44e09222e9cccaa9f80e29f7f5351f2b (diff) | |
| parent | 2a88b6e81589b1d064e03db066feaaa58f6a2d13 (diff) | |
Merge branches 'sh/serial-rework' and 'sh/oprofile'