| commit | 617677295b53a40d0e54aac4cbbc216ffbc755dd | [log] [tgz] |
|---|---|---|
| author | Jiri Kosina <jkosina@suse.cz> | Tue Jan 29 10:48:30 2013 +0100 |
| committer | Jiri Kosina <jkosina@suse.cz> | Tue Jan 29 10:48:30 2013 +0100 |
| tree | 51b9e87213243ed5efff252c8e8d8fec4eebc588 | |
| parent | 5c8d1b68e01a144813e38795fe6dbe7ebb506131 [diff] | |
| parent | 6abb7c25775b7fb2225ad0508236d63ca710e65f [diff] |
Merge branch 'master' into for-next Conflicts: drivers/devfreq/exynos4_bus.c Sync with Linus' tree to be able to apply patches that are against newer code (mvneta).