git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
57bdfdd
89abfab
)
Merge branch 'master' into for-next
author
Jiri Kosina
<jkosina@suse.cz>
Fri, 29 Jun 2012 12:45:58 +0000
(14:45 +0200)
committer
Jiri Kosina
<jkosina@suse.cz>
Fri, 29 Jun 2012 12:45:58 +0000
(14:45 +0200)
Conflicts:
include/linux/mmzone.h
Synced with Linus' tree so that trivial patch can be applied
on top of up-to-date code properly.
Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff