diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-11-27 12:39:43 (GMT) |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-11-27 12:39:43 (GMT) |
| commit | 31bccbf39208133415000520c79ebe7b291786df (patch) | |
| tree | e03b799594ec22613ca2eb7382fc0a98e0cd4b0f /arch/arm/plat-omap/ocpi.c | |
| parent | e902be56cbf2a48d96d11d6884767e638d41c712 (diff) | |
| parent | 635f0258e5ae526034486b4ae9020e64bfb7d27e (diff) | |
| download | linux-fsl-qoriq-31bccbf39208133415000520c79ebe7b291786df.tar.xz | |
Merge branch 'clps7500' into devel
Conflicts:
arch/arm/Kconfig
Diffstat (limited to 'arch/arm/plat-omap/ocpi.c')
0 files changed, 0 insertions, 0 deletions