Merge branches 'omap4_clockdomain_hwmod_3.1', 'clock_debugfs_a_3.1', 'omap4_clock_aux...
authorPaul Walmsley <paul@pwsan.com>
Sun, 10 Jul 2011 12:04:55 +0000 (06:04 -0600)
committerPaul Walmsley <paul@pwsan.com>
Sun, 10 Jul 2011 12:04:55 +0000 (06:04 -0600)

Trivial merge