| commit | ca371d2854d48c0c22e7aa031df182f96dc85820 | [log] [tgz] |
|---|---|---|
| author | Paul Mundt <lethal@linux-sh.org> | Mon Jan 09 11:12:55 2012 +0900 |
| committer | Paul Mundt <lethal@linux-sh.org> | Mon Jan 09 11:12:55 2012 +0900 |
| tree | 1c62be8b4da0bfc82fa7ffa1ad5b0e958266cbd1 | |
| parent | 0d376945d0bc0a8f8e00861d506b10e42e8af372 [diff] | |
| parent | a0e86bd4252519321b0d102dc4ed90557aa7bee9 [diff] |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into sh-latest Conflicts: arch/arm/mach-shmobile/clock-sh73a0.c Signed-off-by: Paul Mundt <lethal@linux-sh.org>