lisa/android_kernel_xiaomi_sm8350
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
4c1ac1b491
android_kernel_xiaomi_sm8350/drivers/video
History
David Howells 4c1ac1b491 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 
Conflicts:

	drivers/infiniband/core/iwcm.c
	drivers/net/chelsio/cxgb2.c
	drivers/net/wireless/bcm43xx/bcm43xx_main.c
	drivers/net/wireless/prism54/islpci_eth.c
	drivers/usb/core/hub.h
	drivers/usb/input/hid-core.c
	net/core/netpoll.c

Fix up merge failures with Linus's head and fix new compilation failures.

Signed-Off-By: David Howells <dhowells@redhat.com>
2006-12-05 14:37:56 +00:00
..
aty [PATCH] Fix radeon DDC regression 2006-11-16 21:59:41 -08:00
backlight video: Fix include in hp680_bl. 2006-10-31 12:53:28 +09:00
console WorkStruct: make allyesconfig 2006-11-22 14:57:56 +00:00
geode
i810 [PATCH] i810fb: Honor the return value of pci_enable_device 2006-10-03 08:04:11 -07:00
intelfb Remove unnecessary check in drivers/video/intelfb/intelfbhw.c 2006-10-25 12:05:18 -07:00
kyro
logo
matrox IRQ: Maintain regs pointer globally rather than passing to IRQ handlers 2006-10-05 15:10:12 +01:00
mbx [PATCH] mbxfb: Fix framebuffer size smaller than requested 2006-10-03 08:04:12 -07:00
nvidia [PATCH] nvidiafb: fix unreachable code in nv10GetConfig 2006-11-14 09:09:27 -08:00
pnx4008 [PATCH] pnx4008:fix NULL dereference in rgbfb 2006-11-16 11:43:37 -08:00
riva [PATCH] fbdev: riva warning fix 2006-10-04 07:55:24 -07:00
savage [PATCH] savagefb: Use generic DDC reading 2006-10-03 08:04:10 -07:00
sis [PATCH] drivers/video/sis/sis_main.h Removal of old code 2006-10-03 08:04:12 -07:00
68328fb.c
acornfb.c
acornfb.h
amba-clcd.c
amifb.c IRQ: Maintain regs pointer globally rather than passing to IRQ handlers 2006-10-05 15:10:12 +01:00
arcfb.c IRQ: Maintain regs pointer globally rather than passing to IRQ handlers 2006-10-05 15:10:12 +01:00
asiliantfb.c
atafb.c IRQ: Maintain regs pointer globally rather than passing to IRQ handlers 2006-10-05 15:10:12 +01:00
au1100fb.c [PATCH] au1100fb: Add option to enable/disable the cursor 2006-10-03 08:04:09 -07:00
au1100fb.h
au1200fb.c IRQ: Maintain regs pointer globally rather than passing to IRQ handlers 2006-10-05 15:10:12 +01:00
au1200fb.h
bt431.h
bt455.h
bw2.c
c2p.c
c2p.h
cfbcopyarea.c
cfbfillrect.c
cfbimgblt.c
cg3.c
cg6.c
cg14.c
chipsfb.c
cirrusfb.c
clps711xfb.c
controlfb.c [controlfb] Ifdef for when CONFIG_NVRAM isn't enabled. 2006-10-18 08:49:31 -04:00
controlfb.h
cyber2000fb.c
cyber2000fb.h
cyberfb.c
cyberfb.h
cyblafb.c
dnfb.c
edid.h
epson1355fb.c
fb_ddc.c Fix generic fb_ddc i2c edid probe msg 2006-11-16 22:18:28 -08:00
fb_notify.c [PATCH] fbdev: statically link the framebuffer notification functions 2006-07-31 13:28:44 -07:00
fbcmap.c
fbcvt.c
fbmem.c Driver core: convert fb code to use struct device 2006-12-01 14:52:00 -08:00
fbmon.c
fbsysfs.c Driver core: convert fb code to use struct device 2006-12-01 14:52:00 -08:00
ffb.c
fm2fb.c
g364fb.c
gbefb.c
hgafb.c
hitfb.c sh: Cleanup board header directories. 2006-10-19 16:30:32 +09:00
hpfb.c
igafb.c [igafb] Add pci dev table for module auto loading. 2006-10-18 08:50:49 -04:00
imacfb.c [PATCH] x86: Fix dmi detection of MacBookPro and iMac 2006-08-27 11:01:29 -07:00
imsttfb.c
imxfb.c
imxfb.h
Kconfig [PATCH] revert "nvidiafb: use generic ddc reading" 2006-10-11 11:14:14 -07:00
leo.c
macfb.c
macmodes.c
macmodes.h
Makefile [PATCH] fbdev: Add generic ddc read functionality 2006-10-03 08:04:09 -07:00
maxinefb.c
modedb.c
neofb.c
offb.c [POWERPC] Fix various offb issues 2006-11-01 14:52:48 +11:00
p9100.c
platinumfb.c [platinumfb] Ifdef for when CONFIG_NVRAM isn't enabled. 2006-10-18 08:52:48 -04:00
platinumfb.h
pm2fb.c
pm3fb.c
pmag-aa-fb.c
pmag-ba-fb.c
pmagb-b-fb.c
pvr2fb.c IRQ: Maintain regs pointer globally rather than passing to IRQ handlers 2006-10-05 15:10:12 +01:00
pxafb.c IRQ: Maintain regs pointer globally rather than passing to IRQ handlers 2006-10-05 15:10:12 +01:00
pxafb.h [ARM] 3848/1: pxafb: Add option of fixing video modes and spitz QVGA mode support 2006-10-02 13:33:37 +01:00
q40fb.c
retz3fb.c
retz3fb.h
s1d13xxxfb.c
s3c2410fb.c IRQ: Maintain regs pointer globally rather than passing to IRQ handlers 2006-10-05 15:10:12 +01:00
s3c2410fb.h fix file specification in comments 2006-10-03 23:01:26 +02:00
S3triofb.c Merge branch 'merge' 2006-08-01 10:37:25 +10:00
sa1100fb.c IRQ: Maintain regs pointer globally rather than passing to IRQ handlers 2006-10-05 15:10:12 +01:00
sa1100fb.h
sbuslib.c
sbuslib.h
sgivwfb.c
skeletonfb.c
sstfb.c [PATCH] sstfb: cleanups 2006-10-03 08:04:13 -07:00
sticore.h
stifb.c
sun3fb.c
tcx.c
tdfxfb.c
tgafb.c
tridentfb.c
tx3912fb.c
valkyriefb.c [valkyriefb] Ifdef for when CONFIG_NVRAM isn't enabled. 2006-10-18 08:53:37 -04:00
valkyriefb.h
vesafb.c
vfb.c
vga16fb.c
vgastate.c
virgefb.c
virgefb.h
w100fb.c
w100fb.h