git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
7b39f90
537b60d
)
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
author
David S. Miller
<davem@davemloft.net>
Wed, 19 May 2010 06:01:55 +0000
(23:01 -0700)
committer
David S. Miller
<davem@davemloft.net>
Wed, 19 May 2010 06:01:55 +0000
(23:01 -0700)
Conflicts:
include/linux/mod_devicetable.h
scripts/mod/file2alias.c
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff