| commit | 742eaa6a6e356a16788ce6530271de89bc4f8fb5 | [log] [tgz] |
|---|---|---|
| author | Russell King <rmk+kernel@arm.linux.org.uk> | Mon Dec 05 23:20:17 2011 +0000 |
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | Mon Dec 05 23:20:17 2011 +0000 |
| tree | 12fc040daab06ac796c61c1d92bfad9bb054d1c1 | |
| parent | ba8bb18a03f8c7508565c385576a5431a4ad804a [diff] | |
| parent | ae72fd588a2b302222769b44775912b83f0785eb [diff] |
Merge branch 'for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/will/linux into devel-stable Conflicts: arch/arm/common/gic.c arch/arm/plat-omap/include/plat/common.h