diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2012-01-09 02:03:09 +0100 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2012-01-09 02:03:09 +0100 |
| commit | e0a23ce20eb98c17c5f7bf4b7f34cb31d0b102f9 (patch) | |
| tree | 948b70d7004a475ed91c452c38a96f6b05b92dfe /drivers/sh | |
| parent | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torval... (diff) | |
| parent | sh: pfc: Unlock register support (diff) | |
| parent | sh: use ioread32/iowrite32 and mapped_reg for div6 (diff) | |
| download | linux-e0a23ce20eb98c17c5f7bf4b7f34cb31d0b102f9.tar.xz linux-e0a23ce20eb98c17c5f7bf4b7f34cb31d0b102f9.zip | |
Merge branches 'common/pfc' and 'common/clkfwk' into rmobile/marzen
Conflicts:
arch/arm/mach-shmobile/clock-sh73a0.c
Signed-off-by: Paul Mundt <lethal@linux-sh.org>