Merge from unstable back to experimental
Merge branch 'debian-unstable' into debian-experimental Conflicts: debian/changelog debian/control
Showing
- .gitignore 99 additions, 0 deletions.gitignore
- autogen.sh 12 additions, 0 deletionsautogen.sh
- debian/changelog 9 additions, 1 deletiondebian/changelog
- debian/control 3 additions, 2 deletionsdebian/control
- debian/docs 0 additions, 1 deletiondebian/docs
- shared-core/drm_drawable.c 330 additions, 0 deletionsshared-core/drm_drawable.c
- shared-core/drm_pciids.txt 464 additions, 0 deletionsshared-core/drm_pciids.txt
- shared-core/i915_dma.c 846 additions, 0 deletionsshared-core/i915_dma.c
- shared-core/i915_drv.h 342 additions, 0 deletionsshared-core/i915_drv.h
- shared-core/i915_irq.c 578 additions, 0 deletionsshared-core/i915_irq.c
- shared-core/i915_mem.c 397 additions, 0 deletionsshared-core/i915_mem.c
- shared-core/imagine_drv.h 43 additions, 0 deletionsshared-core/imagine_drv.h
- shared-core/mach64_dma.c 1539 additions, 0 deletionsshared-core/mach64_dma.c
- shared-core/mach64_drv.h 1048 additions, 0 deletionsshared-core/mach64_drv.h
- shared-core/mach64_irq.c 136 additions, 0 deletionsshared-core/mach64_irq.c
- shared-core/mach64_state.c 903 additions, 0 deletionsshared-core/mach64_state.c
- shared-core/mga_dma.c 1182 additions, 0 deletionsshared-core/mga_dma.c
- shared-core/mga_drv.h 683 additions, 0 deletionsshared-core/mga_drv.h
- shared-core/mga_irq.c 150 additions, 0 deletionsshared-core/mga_irq.c
- shared-core/mga_state.c 1178 additions, 0 deletionsshared-core/mga_state.c
Please register or sign in to comment