git.openwrt.org Git - openwrt/staging/blogic.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	0b019a41553a919965bb02d07d54e3e6c57a796d
tree	6e329b4159b440d2aac5200a5c07103fe261c096	tree \| snapshot
parent	5f6878b0d22f9b93f9698f88c335007e2a3c3bbc	commit \| diff
parent	054d5c9238f3c577ad51195c3ee7803613f322cc	commit \| diff

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

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

John Crispins staging tree