projects / linux-drm-fsl-dcu.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4f47707 adfc764)
Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
authorLinus Torvalds <torvalds@g5.osdl.org>
Tue, 10 Jan 2006 17:00:55 +0000 (09:00 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Tue, 10 Jan 2006 17:00:55 +0000 (09:00 -0800)
1  2 
drivers/char/vr41xx_rtc.c patch | diff1 | diff2 | blob | history
drivers/serial/vr41xx_siu.c patch | diff1 | diff2 | blob | history

diff --cc drivers/char/vr41xx_rtc.c
Simple merge
diff --cc drivers/serial/vr41xx_siu.c
Simple merge
Freescale DCU DRM driver