diff options
| author | Russell King | 2011-01-06 23:33:32 +0100 |
|---|---|---|
| committer | Russell King | 2011-01-06 23:33:32 +0100 |
| commit | 404a02cbd2ae8bf256a2fa1169bdfe86bb5ebb34 (patch) | |
| tree | 99119edc53fdca73ed7586829b8ee736e09440b3 /arch/arm/mach-shmobile/clock-sh7372.c | |
| parent | Merge branch 'pgt' (early part) into devel (diff) | |
| parent | Merge branch 'for-rmk' of git://git.pengutronix.de/git/imx/linux-2.6 into dev... (diff) | |
| download | kernel-qcow2-linux-404a02cbd2ae8bf256a2fa1169bdfe86bb5ebb34.tar.gz kernel-qcow2-linux-404a02cbd2ae8bf256a2fa1169bdfe86bb5ebb34.tar.xz kernel-qcow2-linux-404a02cbd2ae8bf256a2fa1169bdfe86bb5ebb34.zip | |
Merge branch 'devel-stable' into devel
Conflicts:
arch/arm/mach-pxa/clock.c
arch/arm/mach-pxa/clock.h
Diffstat (limited to 'arch/arm/mach-shmobile/clock-sh7372.c')
0 files changed, 0 insertions, 0 deletions