git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
61282f3
0034102
)
Merge branch 'master' into for-next
author
Jiri Kosina
<jkosina@suse.cz>
Sun, 8 Apr 2012 19:48:52 +0000
(21:48 +0200)
committer
Jiri Kosina
<jkosina@suse.cz>
Sun, 8 Apr 2012 19:48:52 +0000
(21:48 +0200)
Merge with latest Linus' tree, as I have incoming patches
that fix code that is newer than current HEAD of for-next.
Conflicts:
drivers/net/ethernet/realtek/r8169.c
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff