Merge branch 'omap/fixes-for-3.1' into fixes
authorArnd Bergmann <arnd@arndb.de>
Sat, 8 Oct 2011 20:21:07 +0000 (22:21 +0200)
committerArnd Bergmann <arnd@arndb.de>
Sat, 8 Oct 2011 20:21:07 +0000 (22:21 +0200)
commitaab3a70e98a1492833c713fe095dbdccb3bc6262
tree4cdd2e9a8293f1d86f72537487f8ebf50ddde11e
parent98e87d57aab9b1594f9cc53a386fcb6f2f2ba6e2
parentb8e111a74d281b70e88bd67fec48cfda4f9bdce2
Merge branch 'omap/fixes-for-3.1' into fixes