aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2011-09-10 23:20:25 +0200
committerArnd Bergmann <arnd@arndb.de>2011-09-10 23:20:25 +0200
commit1f51b001cccf3a16b9191de3dc67c58689cc44d6 (patch)
tree627bdd0a3b1f49f267f17cbe51da08ecde07e0ee
parent7caaf7efb98a4f713e4c8b16289e03874aace493 (diff)
parent876355014ce3a7ba8ca299522b215365b4a3fb61 (diff)
parent897a6a1a14837d6d582bfd1fd7aba00be44b6469 (diff)
downloadlinux-stericsson-1f51b001cccf3a16b9191de3dc67c58689cc44d6.tar.gz
Merge branches 'cns3xxx/fixes', 'omap/fixes' and 'davinci/fixes' into fixes