Merge branch 'cleanup-part-2' of git+ssh://master.kernel.org/pub/scm/linux/kernel...
authorArnd Bergmann <arnd@arndb.de>
Fri, 8 Jul 2011 15:01:45 +0000 (15:01 +0000)
committerArnd Bergmann <arnd@arndb.de>
Fri, 8 Jul 2011 15:01:45 +0000 (15:01 +0000)

Trivial merge