git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
5c8d1b6
6abb7c2
)
Merge branch 'master' into for-next
author
Jiri Kosina
<jkosina@suse.cz>
Tue, 29 Jan 2013 09:48:30 +0000
(10:48 +0100)
committer
Jiri Kosina
<jkosina@suse.cz>
Tue, 29 Jan 2013 09:48:30 +0000
(10:48 +0100)
Conflicts:
drivers/devfreq/exynos4_bus.c
Sync with Linus' tree to be able to apply patches that are
against newer code (mvneta).
Trivial merge