| commit | 73a09d212ec65b7068a283e6034fa05649d3d075 | [log] [tgz] |
|---|---|---|
| author | Russell King <rmk+kernel@arm.linux.org.uk> | Sat Mar 09 15:49:32 2013 +0000 |
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | Sat Mar 09 15:49:32 2013 +0000 |
| tree | 07e08fb552afd3e0a239e103b9f9cf571593316b | |
| parent | 6dbe51c251a327e012439c4772097a13df43c5b8 [diff] | |
| parent | 6ebd4d038dbb626a43d87db3007e71f92f49d7b3 [diff] |
Merge branch 'for-next' of git://git.pengutronix.de/git/ukl/linux into devel-stable Conflicts: arch/arm/include/asm/cputype.h Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>