commit | 9ced9f03d12d7539e86b0bff5bc750153c976c34 | [log] [tgz] |
---|---|---|
author | Russell King <rmk+kernel@arm.linux.org.uk> | Tue Mar 15 16:32:47 2011 +0000 |
committer | Russell King <rmk+kernel@arm.linux.org.uk> | Tue Mar 15 16:32:47 2011 +0000 |
tree | dcb8a23b0245d3d4d2719d7ea987f7eee608c553 | |
parent | 9b963f32c38b4c7d2da667e4458967b550f30bee [diff] | |
parent | b0b6ff0b21057bb8e58b0be8b427a4713fd4b5a5 [diff] |
Merge branch 'for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into devel-stable Conflicts: arch/arm/mm/Kconfig