diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2012-11-17 01:53:36 (GMT) |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2012-11-17 01:53:36 (GMT) |
| commit | 6929039761a3414e5c71448eb3dcc1d82fc1891d (patch) | |
| tree | 49b349170dd93821c2d515fee3931a4023da35da /arch/arm/mach-omap2/clockdomains44xx_data.c | |
| parent | e0fd18ce1169595df929373cad2ae9b00b2289c2 (diff) | |
| parent | 6ba1bc826d160fe4f32bcb188687dcca4bdfaf3d (diff) | |
| download | linux-fsl-qoriq-6929039761a3414e5c71448eb3dcc1d82fc1891d.tar.xz | |
Merge commit '6ba1bc826d160fe4f32bcb188687dcca4bdfaf3d' into arch-arm64
Backmerge from mainline commit that introduced a trivial conflict in
arch/arm64/kernel/process.c - a bunch of functions removed next to the
place where kernel_thread() used to be.
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'arch/arm/mach-omap2/clockdomains44xx_data.c')
0 files changed, 0 insertions, 0 deletions