| commit | 04cf399640b7acfa9abe2eb7900cd934db8af697 | [log] [tgz] |
|---|---|---|
| author | Paul Mundt <lethal@linux-sh.org> | Mon Jan 09 09:56:37 2012 +0900 |
| committer | Paul Mundt <lethal@linux-sh.org> | Mon Jan 09 09:56:37 2012 +0900 |
| tree | f9a055f2f0170550f5f0b0507b06ffce8d98945d | |
| parent | 17f0056e6a2f3d1818801705f5e12b71217bf4ef [diff] | |
| parent | a0e86bd4252519321b0d102dc4ed90557aa7bee9 [diff] |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into rmobile-latest Conflicts: arch/arm/mach-shmobile/Makefile Signed-off-by: Paul Mundt <lethal@linux-sh.org>