git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
189f0e7
ce8838c
)
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux...
author
Grazvydas Ignotas
<notasas@gmail.com>
Fri, 7 May 2010 13:52:18 +0000
(16:52 +0300)
committer
Grazvydas Ignotas
<notasas@gmail.com>
Fri, 7 May 2010 13:52:18 +0000
(16:52 +0300)
Conflicts:
drivers/usb/musb/davinci.c
security/Kconfig
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff