diff options
| author | David Woodhouse <David.Woodhouse@intel.com> | 2008-10-21 14:42:20 -0400 |
|---|---|---|
| committer | David Woodhouse <David.Woodhouse@intel.com> | 2008-10-21 14:42:20 -0400 |
| commit | b876d08f816527af257e13d89fb0d3b4b849223c (patch) | |
| tree | 40569f568230f918ca55f04b355e251747f913ed /CREDITS | |
| parent | b364776ad1208a71f0c53578c84619a395412a8d (diff) | |
| parent | 2515ddc6db8eb49a79f0fe5e67ff09ac7c81eab4 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
drivers/pci/dmar.c
Diffstat (limited to 'CREDITS')
| -rw-r--r-- | CREDITS | 12 |
1 files changed, 6 insertions, 6 deletions
| @@ -1653,14 +1653,14 @@ S: Chapel Hill, North Carolina 27514-4818 | |||
| 1653 | S: USA | 1653 | S: USA |
| 1654 | 1654 | ||
| 1655 | N: Dave Jones | 1655 | N: Dave Jones |
| 1656 | E: davej@codemonkey.org.uk | 1656 | E: davej@redhat.com |
| 1657 | W: http://www.codemonkey.org.uk | 1657 | W: http://www.codemonkey.org.uk |
| 1658 | D: x86 errata/setup maintenance. | 1658 | D: Assorted VIA x86 support. |
| 1659 | D: AGPGART driver. | 1659 | D: 2.5 AGPGART overhaul. |
| 1660 | D: CPUFREQ maintenance. | 1660 | D: CPUFREQ maintenance. |
| 1661 | D: Backport/Forwardport merge monkey. | 1661 | D: Fedora kernel maintainence. |
| 1662 | D: Various Janitor work. | 1662 | D: Misc/Other. |
| 1663 | S: United Kingdom | 1663 | S: 314 Littleton Rd, Westford, MA 01886, USA |
| 1664 | 1664 | ||
| 1665 | N: Martin Josfsson | 1665 | N: Martin Josfsson |
| 1666 | E: gandalf@wlug.westbo.se | 1666 | E: gandalf@wlug.westbo.se |