diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-11-21 20:36:05 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-11-21 20:36:05 -0800 |
| commit | b0d81664a0092d8f6df7742b5aee6fcfd326b36c (patch) | |
| tree | 990e2b21b93d0bc8b0d7170bf121f06ac60f919d /drivers/gpu/drm/nouveau/nouveau_fbcon.c | |
| parent | f8f5ed7c996ad9426847ce09b828d415cb19bc06 (diff) | |
| parent | 6ac2afb3f4601d74778a6ef76c50813a5b85b133 (diff) | |
Merge branch 'char-misc-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc
* 'char-misc-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc:
misc: ad525x_dpot: Fix AD8400 spi transfer size.
pch_phub: Fix MAC address writing issue for LAPIS ML7831
pch_phub: Improve ADE(Address Decode Enable) control
pch_phub: Change company name OKI SEMICONDUCTOR to LAPIS Semiconductor
pch_phub: Support new device LAPIS Semiconductor ML7831 IOH
pcie-gadget-spear: Add "platform:" prefix for platform modalias
MAINTAINERS: add CHAR and MISC driver maintainers
Diffstat (limited to 'drivers/gpu/drm/nouveau/nouveau_fbcon.c')
0 files changed, 0 insertions, 0 deletions