git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
290293e
a5abba9
)
Merge commit 'v2.6.38-rc8' into spi/next
author
Grant Likely
<grant.likely@secretlab.ca>
Sat, 12 Mar 2011 08:25:53 +0000
(
01:25
-0700)
committer
Grant Likely
<grant.likely@secretlab.ca>
Sat, 12 Mar 2011 08:25:53 +0000
(
01:25
-0700)
Conflicts:
drivers/spi/pxa2xx_spi_pci.c
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff