git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
044f324
7705a87
)
Merge branch 'origin'
author
Linus Torvalds
<torvalds@g5.osdl.org>
Tue, 21 Mar 2006 16:52:18 +0000
(08:52 -0800)
committer
Linus Torvalds
<torvalds@g5.osdl.org>
Tue, 21 Mar 2006 16:52:18 +0000
(08:52 -0800)
Conflicts:
Documentation/video4linux/CARDLIST.cx88
drivers/media/video/cx88/Kconfig
drivers/media/video/em28xx/em28xx-video.c
drivers/media/video/saa7134/saa7134-dvb.c
Resolved as in the original merge by Mauro Carvalho Chehab
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff