]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commitd553140349a798dca3766e7e817d783a6eaa8a8a
treedcb8a23b0245d3d4d2719d7ea987f7eee608c553
parent76b8cc327915ef017ba4bf36020fd80b19559ae1
parent48c579740ad42b63697909ab60b963ed78346ffd
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
arch/arm/mm/Kconfig
drivers/tty/serial/Kconfig