git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
a41eeba
d71792a
)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
author
David Woodhouse
<David.Woodhouse@intel.com>
Mon, 14 Jul 2008 22:49:04 +0000
(15:49 -0700)
committer
David Woodhouse
<David.Woodhouse@intel.com>
Mon, 14 Jul 2008 22:51:11 +0000
(15:51 -0700)
Conflicts:
sound/pci/Kconfig
Trivial merge