]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 9407fe6 557c7fa)
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)
commitcd2e2d8483bb94593104eccaaca61fdc80f12c49
tree9649d193558e7c662257063a77ab7422379ac45btree | snapshot
parent9407fe6310358e7343c517052d1c41e255d1a4dacommit | diff
parent557c7faf0d1b9f3710bc1fe68a749628faf87005commit | 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
Linux Kernel Source Tree.