git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
a6f15ad
0cb583f
)
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
author
Paul Mundt
<lethal@linux-sh.org>
Wed, 16 Sep 2009 04:48:32 +0000
(13:48 +0900)
committer
Paul Mundt
<lethal@linux-sh.org>
Wed, 16 Sep 2009 04:48:32 +0000
(13:48 +0900)
Conflicts:
arch/sh/kernel/vmlinux.lds.S
Trivial merge