projects / profile / ivi / kernel-x86-ivi.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: fd9470c 7c8ad98)
Merge unstable branch 'omap-rmk'
authorRussell King <rmk@dyn-67.arm.linux.org.uk>
Fri, 3 Oct 2008 10:52:33 +0000 (11:52 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Fri, 3 Oct 2008 10:52:33 +0000 (11:52 +0100)
Merge branch 'omap-rmk' into omap-all

1  2 
arch/arm/mach-omap2/clock.c patch | diff1 | diff2 | blob | history
arch/arm/mach-omap2/prm.h patch | diff1 | diff2 | blob | history

diff --cc arch/arm/mach-omap2/clock.c
Simple merge
diff --cc arch/arm/mach-omap2/prm.h
Simple merge
Domain: System / Uncategorized;