]> git.karo-electronics.de Git - linux-beck.git/commit
projects / linux-beck.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 3f96a2d 8cb8de5)
Merge tag 'omap-devel-f-for-3.6' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorTony Lindgren <tony@atomide.com>
Thu, 5 Jul 2012 09:13:04 +0000 (02:13 -0700)
committerTony Lindgren <tony@atomide.com>
Thu, 5 Jul 2012 09:13:04 +0000 (02:13 -0700)
commitac5b0ea3d00d231dd9cedd45636b29defc368a4c
tree9649d193558e7c662257063a77ab7422379ac45btree | snapshot
parent3f96a2d90e6923e2dd1e35d2f149a70a4d0f678ccommit | diff
parent8cb8de5d87b75f2ecaa1189079764340ea366c0ecommit | diff
Merge tag 'omap-devel-f-for-3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/pjw/omap-pending into cleanup-part2

Miscellaneous OMAP clock, hwmod, clockdomain, and powerdomain patches
for 3.6.  Mostly small infrastructure improvements, and preparation
for OMAP5 and AM33xx code.

Conflicts:
arch/arm/mach-omap2/omap_hwmod.c
arch/arm/plat-omap/include/plat/omap_hwmod.h
arch/arm/mach-omap2/control.h diff1 | diff2 | blob | history
arch/arm/mach-omap2/omap_hwmod.c diff1 | diff2 | blob | history
arch/arm/plat-omap/include/plat/omap_hwmod.h diff1 | diff2 | blob | history
Beck SC1x5 Kernel