| commit | 6ae25a5b9d7ba86d6ac19c403dfa57dae6caa73d | [log] [tgz] |
|---|---|---|
| author | Russell King <rmk+kernel@arm.linux.org.uk> | Thu Dec 08 18:02:04 2011 +0000 |
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | Thu Dec 08 18:02:04 2011 +0000 |
| tree | 41d04269f268d6162e5f1866496dd42fbc79d2a4 | |
| parent | 3ee0fc5ca129cbae81c073756febcb1c552af446 [diff] | |
| parent | 497b7e943d0dc5743454de56dcdb67352bbf96b2 [diff] |
Merge branch 'for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/cmarinas/linux into devel-stable Conflicts: arch/arm/mm/ioremap.c