git.baikalelectronics.ru Git - kernel.git/commit

]> git.baikalelectronics.ru Git - kernel.git/commit

author	Russell King <rmk+kernel@arm.linux.org.uk>
	Tue, 10 Aug 2010 22:17:52 +0000 (23:17 +0100)
committer	Russell King <rmk+kernel@arm.linux.org.uk>
	Tue, 10 Aug 2010 22:17:52 +0000 (23:17 +0100)
commit	e0335285c921d4326f7ebdada5f30b64ac32b7da
tree	6e329b4159b440d2aac5200a5c07103fe261c096	tree \| snapshot
parent	a0c9fad7c691456bd649062d78d2ef0e94df1c26	commit \| diff
parent	001fe3d04906414ab439640703686ae93d0a122a	commit \| diff

Merge branches 'master' and 'devel' into for-linus

Conflicts:
arch/arm/Kconfig
arch/arm/mm/Kconfig

Linux Kernel Source Tree.