| commit | f862f904d357dc0d3612347a8dbabe6fae037fbb | [log] [tgz] |
|---|---|---|
| author | Paul Mundt <lethal@linux-sh.org> | Thu Jan 06 18:24:07 2011 +0900 |
| committer | Paul Mundt <lethal@linux-sh.org> | Thu Jan 06 18:24:07 2011 +0900 |
| tree | d7f5c2d5f85fd9e1cfc36beae904dc4f9cca04a3 | |
| parent | 6f09e41d704fe0bc9157a5357480751d39361d01 [diff] | |
| parent | 3c0eee3fe6a3a1c745379547c7e7c904aa64f6d5 [diff] |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6 into sh-latest Conflicts: arch/sh/kernel/cpu/sh2a/clock-sh7201.c Signed-off-by: Paul Mundt <lethal@linux-sh.org>