Merge branches 'dmtimer_precleanup_3.1', 'hwmod_core_cleanup_a_3.1', 'combine_common_...
authorPaul Walmsley <paul@pwsan.com>
Sun, 10 Jul 2011 02:24:07 +0000 (20:24 -0600)
committerPaul Walmsley <paul@pwsan.com>
Sun, 10 Jul 2011 02:24:07 +0000 (20:24 -0600)

Trivial merge