diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2012-01-08 19:56:37 -0500 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2012-01-08 19:56:37 -0500 |
| commit | 04cf399640b7acfa9abe2eb7900cd934db8af697 (patch) | |
| tree | f9a055f2f0170550f5f0b0507b06ffce8d98945d /arch/arm/mach-shmobile/clock-r8a7740.c | |
| 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>
Diffstat (limited to 'arch/arm/mach-shmobile/clock-r8a7740.c')
0 files changed, 0 insertions, 0 deletions