diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-08-29 11:59:46 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-08-29 11:59:46 -0700 |
| commit | 115619b34f2fd590d2830fd82f9bcb4ca7d9cdd2 (patch) | |
| tree | 80a3575fd46f5072dab6b93a8baae715e1524cda /drivers/misc/mei/nfc.c | |
| parent | d4f03186c8986ffde34d06fe74a99aab08f7ee0b (diff) | |
| parent | 4d4e2c003bd6c6bdd85080bd096d54d5d251defa (diff) | |
Merge tag 'fbdev-fixes-3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux
Pull fbdev fixes from Tomi Valkeinen:
"Minor fbdev fixes for da8xx-fb, atmel_lcdfb, arm clcd and chipsfb"
* tag 'fbdev-fixes-3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux:
video: da8xx-fb: preserve display width when changing HSYNC
video: of: display_timing: double free on error
drivers: video: fbdev: atmel_lcdfb.c: fix error return code
video: ARM CLCD: Fix calculation of bits-per-pixel
fbdev: Remove __init from chips_hw_init() to fix build failure
Diffstat (limited to 'drivers/misc/mei/nfc.c')
0 files changed, 0 insertions, 0 deletions