OSDN Git Service

Merge branch 'origin'
authorEric Anholt <eric@anholt.net>
Thu, 19 Jul 2007 13:31:26 +0000 (06:31 -0700)
committerEric Anholt <eric@anholt.net>
Thu, 19 Jul 2007 13:31:26 +0000 (06:31 -0700)
commit05204b9c8d021e019456a8dbd83c012e277c7aaf
tree5639c2821d47e92cc615059cbc12e9c050753230
parente544286eae71a6b150af4d86096895c14e42c36e
parent0c95d489abd19efd2ba017e78a4b28cea0854e77
Merge branch 'origin'
linux-core/drmP.h
shared-core/i915_dma.c
shared-core/i915_drv.h
shared-core/i915_irq.c