diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2010-12-02 18:36:21 -0500 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2010-12-02 18:50:36 -0500 |
| commit | b9e68670cc3a13166b389ce847af19b0d0d33c67 (patch) | |
| tree | bb79d91266490fa5bfe77cfef53ead8a1f7a62f6 /drivers/uio/uio_netx.c | |
| parent | 60de2ba51eaba9eefcc355cb20c8582b1481e755 (diff) | |
| parent | 5bddd17fec58f253cddd0bc9eab2cd9eb1bbab4a (diff) | |
Merge branch 'drm-intel-fixes' into drm-intel-next
Conflicts:
drivers/gpu/drm/i915/intel_drv.h
Diffstat (limited to 'drivers/uio/uio_netx.c')
| -rw-r--r-- | drivers/uio/uio_netx.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/uio/uio_netx.c b/drivers/uio/uio_netx.c index 5a18e9f7b836..5ffdb483b015 100644 --- a/drivers/uio/uio_netx.c +++ b/drivers/uio/uio_netx.c | |||
| @@ -2,7 +2,7 @@ | |||
| 2 | * UIO driver for Hilscher NetX based fieldbus cards (cifX, comX). | 2 | * UIO driver for Hilscher NetX based fieldbus cards (cifX, comX). |
| 3 | * See http://www.hilscher.com for details. | 3 | * See http://www.hilscher.com for details. |
| 4 | * | 4 | * |
| 5 | * (C) 2007 Hans J. Koch <hjk@linutronix.de> | 5 | * (C) 2007 Hans J. Koch <hjk@hansjkoch.de> |
| 6 | * (C) 2008 Manuel Traut <manut@linutronix.de> | 6 | * (C) 2008 Manuel Traut <manut@linutronix.de> |
| 7 | * | 7 | * |
| 8 | * Licensed under GPL version 2 only. | 8 | * Licensed under GPL version 2 only. |