| commit | 8cef081c71dd4e16a01a1e63cedab21eef8b5735 | [log] [tgz] |
|---|---|---|
| author | Arnd Bergmann <arnd@arndb.de> | Wed Jul 25 14:33:45 2012 +0200 |
| committer | Arnd Bergmann <arnd@arndb.de> | Wed Jul 25 14:35:04 2012 +0200 |
| tree | b5b0fb5ab09dc60dee5fc8fd8e980359abbd1b1e | |
| parent | 3d55c29fb24286f350f04021bef2dd799e25dd20 [diff] | |
| parent | 9161c3b796a2841a9a7be3d9c9dd121269ce90e8 [diff] |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into fixes The merge of the 'clk-for-linus' branch caused an automated merge failure. Pull that in here so we can fix the problem. Signed-off-by: Arnd Bergmann <arnd@arndb.de>