Merge branch 'cross-platform/clkdev' into next/cross-platform
authorArnd Bergmann <arnd@arndb.de>
Tue, 19 Jul 2011 16:10:44 +0000 (18:10 +0200)
committerArnd Bergmann <arnd@arndb.de>
Tue, 19 Jul 2011 16:10:44 +0000 (18:10 +0200)
commitc8f85523e70f8202ff49858bacd72fa65245f382
treed0dbb5f5662094e90ecdef0b486000368d8f6e7d
parentcc22b4c18540e5e8bf55c7d124044f9317527d3c
parentaa3831cf9d29cfeaebd8c2169378b74111364487
Merge branch 'cross-platform/clkdev' into next/cross-platform