q3k/linux
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
linux/drivers/video
History
Linus Torvalds 2e1ca21d46 Merge master.kernel.org:/pub/scm/linux/kernel/git/sam/kbuild 
* master.kernel.org:/pub/scm/linux/kernel/git/sam/kbuild: (46 commits)
  kbuild: remove obsoleted scripts/reference_* files
  kbuild: fix make help & make *pkg
  kconfig: fix time ordering of writes to .kconfig.d and include/linux/autoconf.h
  Kconfig: remove the CONFIG_CC_ALIGN_* options
  kbuild: add -fverbose-asm to i386 Makefile
  kbuild: clean-up genksyms
  kbuild: Lindent genksyms.c
  kbuild: fix genksyms build error
  kbuild: in makefile.txt note that Makefile is preferred name for kbuild files
  kbuild: replace PHONY with FORCE
  kbuild: Fix bug in crc symbol generating of kernel and modules
  kbuild: change kbuild to not rely on incorrect GNU make behavior
  kbuild: when warning symbols exported twice now tell user this is the problem
  kbuild: fix make dir/file.xx when asm symlink is missing
  kbuild: in the section mismatch check try harder to find symbols
  kbuild: fix section mismatch check for unwind on IA64
  kbuild: kill false positives from section mismatch warnings for powerpc
  kbuild: kill trailing whitespace in modpost & friends
  kbuild: small update of allnoconfig description
  kbuild: make namespace.pl CROSS_COMPILE happy
  ...

Trivial conflict in arch/ppc/boot/Makefile manually fixed up
2006-03-25 08:48:48 -08:00
..
aty [PATCH] s/;;/;/g 2006-03-24 07:33:24 -08:00
backlight [PATCH] fix hardcoded values in collie frontlight 2006-03-25 08:22:55 -08:00
console [PATCH] vgacon: no vertical resizing on EGA 2006-02-24 14:31:37 -08:00
geode [PATCH] gx1fb: (try to) play nicer with various BIOSes 2006-01-14 18:27:14 -08:00
i810 [PATCH] i810fb_cursor(): use GFP_ATOMIC 2006-03-22 07:53:55 -08:00
intelfb [PATCH] intelfb: Fix buffer overrun 2006-03-11 09:19:35 -08:00
kyro [PATCH] kyrofb: Fix uninitialized value 2006-03-11 09:19:35 -08:00
logo spelling: s/retreive/retrieve/ 2006-01-10 00:10:13 +01:00
matrox kbuild: remove checkconfig.pl 2006-02-19 09:51:22 +01:00
nvidia [PATCH] nvidiafb: Add support for Geforce4 MX 4000 2006-02-11 21:41:13 -08:00
riva [PATCH] rivafb: Trim rivafb_pan_display 2006-01-10 08:01:46 -08:00
savage [PATCH] savagefb: Fix kfree before use 2006-03-11 09:19:35 -08:00
sis [PATCH] fbdev: Sanitize ->fb_ioctl prototype 2006-01-14 18:27:14 -08:00
68328fb.c [PATCH] fbdev: Sanitize ->fb_mmap prototype 2006-01-14 18:27:15 -08:00
acornfb.c [PATCH] remove set_page_count() outside mm/ 2006-03-22 07:54:02 -08:00
acornfb.h
amba-clcd.c [ARM] amba-clcd: Allow RGB555 and RGB565 with 16bpp 2006-01-26 14:12:06 +00:00
amifb.c [PATCH] fbdev: Sanitize ->fb_ioctl prototype 2006-01-14 18:27:14 -08:00
arcfb.c [PATCH] arcfb: Fix dereference before NULL check 2006-03-11 09:19:35 -08:00
asiliantfb.c [PATCH] Fix pseudo_palette setup in asiliantfb_setcolreg() 2006-02-24 14:31:39 -08:00
atafb.c [PATCH] fbdev: Sanitize ->fb_ioctl prototype 2006-01-14 18:27:14 -08:00
au1100fb.c [PATCH] au1100fb: replaced io_remap_page_range() with io_remap_pfn_range() 2006-02-24 14:31:38 -08:00
au1100fb.h
bt431.h
bt455.h
bw2.c BUG_ON() Conversion in drivers/video/ 2006-03-24 18:53:18 +01:00
c2p.c
c2p.h
cfbcopyarea.c
cfbfillrect.c
cfbimgblt.c
cg3.c [PATCH] fbdev: Sanitize ->fb_mmap prototype 2006-01-14 18:27:15 -08:00
cg6.c [PATCH] fbdev: Sanitize ->fb_mmap prototype 2006-01-14 18:27:15 -08:00
cg14.c [PATCH] fbdev: Sanitize ->fb_mmap prototype 2006-01-14 18:27:15 -08:00
chipsfb.c
cirrusfb.c [PATCH] amiga: fix driver_register() return handling, remove zorro_module_init() 2006-03-25 08:22:53 -08:00
clps711xfb.c
controlfb.c [PATCH] fbdev: Sanitize ->fb_mmap prototype 2006-01-14 18:27:15 -08:00
controlfb.h
cyber2000fb.c [ARM] Remove asm/irq.h includes from ARM drivers 2006-01-09 13:56:42 +00:00
cyber2000fb.h
cyberfb.c
cyberfb.h
cyblafb.c [PATCH] PCI: cyblafb: remove pci_module_init() return, really. 2006-01-31 18:00:13 -08:00
dnfb.c
edid.h
epson1355fb.c [PATCH] Mark empty release functions as broken 2006-03-20 13:42:57 -08:00
fbcmap.c
fbcvt.c [PATCH] fbdev: Replace kmalloc with kzalloc 2006-01-10 08:01:51 -08:00
fbmem.c [SPARC]: Respect vm_page_prot in io_remap_page_range(). 2006-03-22 01:15:13 -08:00
fbmon.c [PATCH] fbdev: Replace kmalloc with kzalloc 2006-01-10 08:01:51 -08:00
fbsysfs.c [PATCH] fbdev: Replace kmalloc with kzalloc 2006-01-10 08:01:51 -08:00
ffb.c BUG_ON() Conversion in drivers/video/ 2006-03-24 18:53:18 +01:00
fm2fb.c
g364fb.c
gbefb.c [PATCH] gbefb: IP32 gbefb depth change fix 2006-02-24 14:31:38 -08:00
hgafb.c [PATCH] fbdev: hgafb: Convert to platform device 2006-01-10 08:01:45 -08:00
hitfb.c
hpfb.c [PATCH] hp300: fix driver_register() return handling, remove dio_module_init() 2006-03-25 08:22:53 -08:00
igafb.c [PATCH] fbdev: Sanitize ->fb_mmap prototype 2006-01-14 18:27:15 -08:00
imsttfb.c [PATCH] imsttfb: Fix resource leak 2006-03-11 09:19:35 -08:00
imxfb.c
imxfb.h
Kconfig remove dead Radeon URL 2006-03-20 20:23:13 +01:00
leo.c [PATCH] fbdev: Sanitize ->fb_mmap prototype 2006-01-14 18:27:15 -08:00
macfb.c [PATCH] m68k: fix macfb init 2006-01-12 09:09:05 -08:00
macmodes.c
macmodes.h
Makefile
maxinefb.c
modedb.c
neofb.c [PATCH] neofb: Fix uninitialized value 2006-03-11 09:19:35 -08:00
offb.c [PATCH] powerpc: Remove device_node addrs/n_addr 2006-01-09 14:53:55 +11:00
p9100.c [PATCH] fbdev: Sanitize ->fb_mmap prototype 2006-01-14 18:27:15 -08:00
platinumfb.c [PATCH] powerpc: Remove device_node addrs/n_addr 2006-01-09 14:53:55 +11:00
platinumfb.h [PATCH] powerpc: Fix platinumfb for some modes 2006-01-09 14:53:51 +11:00
pm2fb.c [PATCH] fbdev: pm2fb: Driver cleanups 2006-01-10 08:01:45 -08:00
pm3fb.c [PATCH] Remove MODULE_PARM 2006-03-25 08:22:52 -08:00
pmag-aa-fb.c [PATCH] fbdev: Sanitize ->fb_ioctl prototype 2006-01-14 18:27:14 -08:00
pmag-ba-fb.c [PATCH] remove bogus asm/bug.h includes. 2006-02-07 20:56:35 -05:00
pmagb-b-fb.c [PATCH] remove bogus asm/bug.h includes. 2006-02-07 20:56:35 -05:00
pvr2fb.c
pxafb.c [PATCH] fbdev: Sanitize ->fb_mmap prototype 2006-01-14 18:27:15 -08:00
pxafb.h
q40fb.c
radeonfb.c [PATCH] fbdev: Sanitize ->fb_ioctl prototype 2006-01-14 18:27:14 -08:00
retz3fb.c
retz3fb.h
s1d13xxxfb.c [PATCH] s1d13xxxfb: Fix resource leak 2006-03-11 09:19:35 -08:00
s3c2410fb.c [ARM] remove duplicate #includes 2006-02-15 10:13:02 +00:00
s3c2410fb.h
S3triofb.c
sa1100fb.c [PATCH] handle errors returned by platform_get_irq*() 2006-03-20 13:42:57 -08:00
sa1100fb.h
sbuslib.c [SPARC]: Respect vm_page_prot in io_remap_page_range(). 2006-03-22 01:15:13 -08:00
sbuslib.h [SPARC]: Fix sbusfb build. 2006-01-17 15:53:11 -08:00
sgivwfb.c [PATCH] fbdev: Sanitize ->fb_mmap prototype 2006-01-14 18:27:15 -08:00
skeletonfb.c [PATCH] skeletonfb: Documentation update 2006-01-10 08:01:49 -08:00
sstfb.c fix typos "wich" -> "which" 2006-03-24 18:23:14 +01:00
sticore.h
stifb.c [PARISC] stifb: Remove obsolete MODULE_PARM() 2006-01-10 21:53:07 -05:00
sun3fb.c
tcx.c [PATCH] fbdev: Sanitize ->fb_mmap prototype 2006-01-14 18:27:15 -08:00
tdfxfb.c [PATCH] tdfxfb: Fix buffer overrun 2006-03-11 09:19:36 -08:00
tgafb.c
tridentfb.c
tx3912fb.c
valkyriefb.c [PATCH] powerpc: Remove device_node addrs/n_addr 2006-01-09 14:53:55 +11:00
valkyriefb.h
vesafb.c [PATCH] Fix vesafb display panning regression 2006-01-10 08:01:47 -08:00
vfb.c [PATCH] Mark empty release functions as broken 2006-03-20 13:42:57 -08:00
vga16fb.c [PATCH] vga16fb: Trim vga16fb_pan_display 2006-01-10 08:01:47 -08:00
vgastate.c [PATCH] fbdev: Replace kmalloc with kzalloc 2006-01-10 08:01:51 -08:00
virgefb.c
virgefb.h
w100fb.c
w100fb.h