diff options
| author | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
|---|---|---|
| committer | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
| commit | c71c03bda1e86c9d5198c5d83f712e695c4f2a1e (patch) | |
| tree | ecb166cb3e2b7e2adb3b5e292245fefd23381ac8 /drivers/char/agp/i460-agp.c | |
| parent | ea53c912f8a86a8567697115b6a0d8152beee5c8 (diff) | |
| parent | 6a00f206debf8a5c8899055726ad127dbeeed098 (diff) | |
Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp
Conflicts:
litmus/sched_cedf.c
Diffstat (limited to 'drivers/char/agp/i460-agp.c')
| -rw-r--r-- | drivers/char/agp/i460-agp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/char/agp/i460-agp.c b/drivers/char/agp/i460-agp.c index e763d3312ce7..75b763cb3ea1 100644 --- a/drivers/char/agp/i460-agp.c +++ b/drivers/char/agp/i460-agp.c | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * For documentation on the i460 AGP interface, see Chapter 7 (AGP Subsystem) of | 2 | * For documentation on the i460 AGP interface, see Chapter 7 (AGP Subsystem) of |
| 3 | * the "Intel 460GTX Chipset Software Developer's Manual": | 3 | * the "Intel 460GTX Chipset Software Developer's Manual": |
| 4 | * http://developer.intel.com/design/itanium/downloads/24870401s.htm | 4 | * http://www.intel.com/design/archives/itanium/downloads/248704.htm |
| 5 | */ | 5 | */ |
| 6 | /* | 6 | /* |
| 7 | * 460GX support by Chris Ahna <christopher.j.ahna@intel.com> | 7 | * 460GX support by Chris Ahna <christopher.j.ahna@intel.com> |