diff options
| author | Dave Airlie <airlied@redhat.com> | 2015-01-08 03:19:24 +0300 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2015-01-08 03:19:24 +0300 |
| commit | f6624888a518c4bdd1fd0f9a1d0c5a6969ff283d (patch) | |
| tree | 21e826b67465730746ab5fae810cb076b877c9db /drivers/power/ds2782_battery.c | |
| parent | 2f6bd4da08b5054ba933be6f7b17ed02ad6c4162 (diff) | |
| parent | ff4c0d5213b015e60aa87c1352604f10ba9c3e12 (diff) | |
| download | linux-f6624888a518c4bdd1fd0f9a1d0c5a6969ff283d.tar.xz | |
Merge branch 'linux-3.19' of git://anongit.freedesktop.org/git/nouveau/linux-2.6 into drm-fixes
- Fix BUG() on !SMP builds
- Fix for OOPS on pre-NV50 that snuck into -next
- MCP7[789A] hang fix where firmware hasn't already setup NISO pollers
- NV4x IGP MSI disable, it doesn't appear to work correctly
- Add GK208B to recognised boards (no code change aside from adding
chipset recognition)
* 'linux-3.19' of git://anongit.freedesktop.org/git/nouveau/linux-2.6:
drm/nouveau/nouveau: Do not BUG_ON(!spin_is_locked()) on UP
drm/nv4c/mc: disable msi
drm/nouveau/fb/ram/mcp77: enable NISO poller
drm/nouveau/fb/ram/mcp77: use carveout reg to determine size
drm/nouveau/fb/ram/mcp77: subclass nouveau_ram
drm/nouveau: wake up the card if necessary during gem callbacks
drm/nouveau/device: Add support for GK208B, resolves bug 86935
drm/nouveau: fix missing return statement in nouveau_ttm_tt_unpopulate
drm/nouveau/bios: fix oops on pre-nv50 chipsets
Diffstat (limited to 'drivers/power/ds2782_battery.c')
0 files changed, 0 insertions, 0 deletions