projects / linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4fa73a1 6daa642)
Merge branch 'omap4-i2c-init' into omap-for-linus
authorTony Lindgren <tony@atomide.com>
Thu, 20 May 2010 18:37:23 +0000 (11:37 -0700)
committerTony Lindgren <tony@atomide.com>
Thu, 20 May 2010 18:37:23 +0000 (11:37 -0700)
1  2 
arch/arm/mach-omap2/devices.c patch | diff1 | diff2 | blob | history
arch/arm/mach-omap2/omap_hwmod.c patch | diff1 | diff2 | blob | history

diff --cc arch/arm/mach-omap2/devices.c
Simple merge
diff --cc arch/arm/mach-omap2/omap_hwmod.c
Simple merge
ep93xx device tree rework repo: git://git.maquefel.me/linux.git