]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
Merge branch 'hwmod_clockevent_2.6.39' of git://git.pwsan.com/linux-2.6 into omap...
authorTony Lindgren <tony@atomide.com>
Tue, 1 Mar 2011 01:58:09 +0000 (17:58 -0800)
committerTony Lindgren <tony@atomide.com>
Tue, 1 Mar 2011 01:58:09 +0000 (17:58 -0800)

Trivial merge