diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-10 19:47:12 +0900 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-10 19:47:12 +0900 |
| commit | ba7067651083bdcc37223d8879478cbc51cca923 (patch) | |
| tree | 4e33d20d4ae41d3b278e888f19177a62a154efcf /arch/s390/include/asm/mman.h | |
| parent | 42859eea96ba6beabfb0369a1eeffa3c7d2bd9cb (diff) | |
| parent | ceb736c395058699dc82e5efdb2a9279a5b29451 (diff) | |
Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux
Pull nouveau drm fixes from Dave Airlie:
"Just a bunch of nouveau fixes, Ben wants to get some alternate
versions into stable."
* 'drm-fixes' of git://people.freedesktop.org/~airlied/linux:
drm/nouveau/timer: bump ptimer's alarm delay from u32 to u64
drm/nouveau/fan: fix a typo in PWM's input clock calculation
drm/nv50/clk: wire up pll_calc hook
drm/nouveau: remove unused _nouveau_parent_ctor
drm/nouveau/bios: fix shadowing of ACPI ROMs larger than 64KiB
Diffstat (limited to 'arch/s390/include/asm/mman.h')
0 files changed, 0 insertions, 0 deletions