diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-10 12:47:12 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-10 12:47:12 +0200 |
| commit | ba7067651083bdcc37223d8879478cbc51cca923 (patch) | |
| tree | 4e33d20d4ae41d3b278e888f19177a62a154efcf /arch/s390/mm/pageattr.c | |
| parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vir... (diff) | |
| parent | Merge branch 'drm-nouveau-fixes' of git://anongit.freedesktop.org/git/nouveau... (diff) | |
| download | linux-ba7067651083bdcc37223d8879478cbc51cca923.tar.xz linux-ba7067651083bdcc37223d8879478cbc51cca923.zip | |
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/mm/pageattr.c')
0 files changed, 0 insertions, 0 deletions