diff options
| author | Dave Airlie <airlied@redhat.com> | 2011-12-20 09:43:53 -0500 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2011-12-20 09:43:53 -0500 |
| commit | 1fbe6f625f69e48c4001051dc1431afc704acfaa (patch) | |
| tree | 826b741201a2e09a627ed350c6ff36935f5cff79 /CREDITS | |
| parent | 0cecdd818cd79d092e36e70dfe3a71f2878d6b96 (diff) | |
| parent | 384703b8e6cd4c8ef08512e596024e028c91c339 (diff) | |
Merge tag 'v3.2-rc6' of /home/airlied/devel/kernel/linux-2.6 into drm-core-next
Merge in the upstream tree to bring in the mainline fixes.
Conflicts:
drivers/gpu/drm/exynos/exynos_drm_fbdev.c
drivers/gpu/drm/nouveau/nouveau_sgdma.c
Diffstat (limited to 'CREDITS')
| -rw-r--r-- | CREDITS | 9 |
1 files changed, 6 insertions, 3 deletions
| @@ -688,10 +688,13 @@ S: Oxfordshire, UK. | |||
| 688 | 688 | ||
| 689 | N: Kees Cook | 689 | N: Kees Cook |
| 690 | E: kees@outflux.net | 690 | E: kees@outflux.net |
| 691 | W: http://outflux.net/ | 691 | E: kees@ubuntu.com |
| 692 | P: 1024D/17063E6D 9FA3 C49C 23C9 D1BC 2E30 1975 1FFF 4BA9 1706 3E6D | 692 | E: keescook@chromium.org |
| 693 | D: Minor updates to SCSI types, added /proc/pid/maps protection | 693 | W: http://outflux.net/blog/ |
| 694 | P: 4096R/DC6DC026 A5C3 F68F 229D D60F 723E 6E13 8972 F4DF DC6D C026 | ||
| 695 | D: Various security things, bug fixes, and documentation. | ||
| 694 | S: (ask for current address) | 696 | S: (ask for current address) |
| 697 | S: Portland, Oregon | ||
| 695 | S: USA | 698 | S: USA |
| 696 | 699 | ||
| 697 | N: Robin Cornelius | 700 | N: Robin Cornelius |