diff options
| author | Dave Airlie <airlied@linux.ie> | 2006-11-06 08:03:18 +1100 |
|---|---|---|
| committer | Dave Airlie <airlied@linux.ie> | 2006-11-06 08:03:18 +1100 |
| commit | 1e90b7ee8cefff59b70e285557aa7920dea77e81 (patch) | |
| tree | 2132e5dcee9e5ef9693742100953063cd6423b3a /bsd-core | |
| parent | 0c34d0f31a691bb649ed69f19e93fc1a723aa1d4 (diff) | |
| parent | 7b6cd95bb6c41653aed78952da0a461bd4791413 (diff) | |
Merge branch 'master' into nouveau-1
Conflicts:
linux-core/Makefile.kernel
Diffstat (limited to 'bsd-core')
| -rw-r--r-- | bsd-core/i915_drv.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/bsd-core/i915_drv.c b/bsd-core/i915_drv.c index 269d7b36..d42b2076 100644 --- a/bsd-core/i915_drv.c +++ b/bsd-core/i915_drv.c @@ -1,4 +1,4 @@ -/* i915_drv.c -- ATI Radeon driver -*- linux-c -*- +/* i915_drv.c -- Intel i915 driver -*- linux-c -*- * Created: Wed Feb 14 17:10:04 2001 by gareth@valinux.com */ /*- |