Merge branch 'clock_devel_3.4' of git://git.pwsan.com/linux-2.6 into clock
authorTony Lindgren <tony@atomide.com>
Tue, 3 Apr 2012 16:43:06 +0000 (09:43 -0700)
committerTony Lindgren <tony@atomide.com>
Tue, 3 Apr 2012 16:43:06 +0000 (09:43 -0700)

Trivial merge