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

Trivial merge