Merge branch 'for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux...
authorRussell King <rmk+kernel@arm.linux.org.uk>
Tue, 15 Mar 2011 16:32:47 +0000 (16:32 +0000)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Tue, 15 Mar 2011 16:32:47 +0000 (16:32 +0000)
commit9ced9f03d12d7539e86b0bff5bc750153c976c34
treedcb8a23b0245d3d4d2719d7ea987f7eee608c553
parent9b963f32c38b4c7d2da667e4458967b550f30bee
parentb0b6ff0b21057bb8e58b0be8b427a4713fd4b5a5
Merge branch 'for-rmk' of git://git./linux/kernel/git/kgene/linux-samsung into devel-stable

Conflicts:
arch/arm/mm/Kconfig
arch/arm/mm/Kconfig
drivers/tty/serial/Kconfig