diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2013-11-12 10:59:08 +0000 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2013-11-12 10:59:08 +0000 |
| commit | 42cbe8271ca6562b4ad4b2e6a9895084b16eef5e (patch) | |
| tree | c45511d5527b601a8a00e4a8958a83b1bfb8c967 /arch/arm/mach-omap2/wd_timer.h | |
| parent | df762eccbadf87850fbee444d729e0f1b1e946f1 (diff) | |
| parent | 6ecf830e5029598732e04067e325d946097519cb (diff) | |
| parent | 1ff44433c661c30afde6e6d2c47a29039a293da4 (diff) | |
| parent | f3964fe1c9d9a887d65faf594669852e4dec46e0 (diff) | |
Merge branches 'fixes', 'mmci' and 'sa11x0' into for-next