git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
0bfd95a
f5412be
)
Merge commit 'v2.6.38-rc6' into devicetree/next
author
Grant Likely
<grant.likely@secretlab.ca>
Mon, 28 Feb 2011 08:36:21 +0000
(
01:36
-0700)
committer
Grant Likely
<grant.likely@secretlab.ca>
Mon, 28 Feb 2011 08:36:21 +0000
(
01:36
-0700)
Conflicts:
drivers/spi/pxa2xx_spi_pci.c
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff