]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
Merge branch 'hwmod_data_fixes_3.2rc' of git://git.pwsan.com/linux-2.6 into fixes-hwmod
authorTony Lindgren <tony@atomide.com>
Sat, 17 Dec 2011 00:05:02 +0000 (16:05 -0800)
committerTony Lindgren <tony@atomide.com>
Sat, 17 Dec 2011 00:05:02 +0000 (16:05 -0800)

Trivial merge