diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-09-10 19:05:19 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-09-10 19:05:19 +0200 |
| commit | 5d67f2e864103e5e853cdceb31564346d4f7bd10 (patch) | |
| tree | 63a7172e09c3f9824fb15e46dffb78d5e5832687 /drivers/w1/w1_netlink.c | |
| parent | Linux 3.6-rc5 (diff) | |
| parent | drm/vmwgfx: add MODULE_DEVICE_TABLE so vmwgfx loads at boot (diff) | |
| download | linux-5d67f2e864103e5e853cdceb31564346d4f7bd10.tar.xz linux-5d67f2e864103e5e853cdceb31564346d4f7bd10.zip | |
Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux
Pull drm fixes from Dave Airlie:
"Just noticed I hadn't send these out, nothing majorly urgent, I know
AMD guys have some regression fixes coming soon.
This contains:
2 nouveau fixes so it loads on the retina MBP systems properly,
2 vmwgfx fixes to load the driver earlier, and allow distros config it
1 error->debug fix in ast
and Keith was playing with 32-on-64 and decided we may as well stick
the compat ioctl in all the drivers. It fixes udl for him."
* 'drm-fixes' of git://people.freedesktop.org/~airlied/linux:
drm/vmwgfx: add MODULE_DEVICE_TABLE so vmwgfx loads at boot
drm/vmwgfx: allow a kconfig option to choose if fbcon is enabled
drm: use drm_compat_ioctl for 32-bit apps
drm/ast: drop debug level on error printk
drm/nv50-/gpio: initialise to vbios defaults during init
drm/nvd0/disp: hopefully fix selection of 6/8bpc mode on DP outputs
Diffstat (limited to 'drivers/w1/w1_netlink.c')
0 files changed, 0 insertions, 0 deletions