kernel/linux
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ synced 2026-10-16 22:39:48 +00:00
Code Issues Releases Packages Activity

Merge branches 'rmobile/kota2' and 'rmobile/marzen' into rmobile-latest

Browse source 
Conflicts:
	arch/arm/mach-shmobile/Kconfig
	arch/arm/mach-shmobile/Makefile

Signed-off-by: Paul Mundt <lethal@linux-sh.org>
This commit is contained in:
Paul Mundt 2012-01-10 17:10:55 +09:00
commit f0a217a31a
25 changed files with 4582 additions and 220 deletions
Download patch file Download diff file Expand all files Collapse all files