git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
aa3e557
4462dc0
)
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
author
Steve French
<sfrench@us.ibm.com>
Thu, 13 May 2010 22:19:32 +0000
(22:19 +0000)
committer
Steve French
<sfrench@us.ibm.com>
Thu, 13 May 2010 22:19:32 +0000
(22:19 +0000)
Conflicts:
fs/cifs/inode.c
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff