diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-04-11 12:19:57 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-04-11 12:19:57 -0700 |
| commit | a56711fa0b418a2cf5eefa00ee65e16443e47790 (patch) | |
| tree | 4ae117f86b685be4a2339579c0d0dc1c81164c4b /drivers/hid/wacom_sys.c | |
| parent | bf16200689118d19de1b8d2a3c314fc21f5dc7bb (diff) | |
| parent | 0dee6c82c2aa5342357dabd0e536a97f72039f0b (diff) | |
| download | talos-obmc-linux-a56711fa0b418a2cf5eefa00ee65e16443e47790.tar.gz talos-obmc-linux-a56711fa0b418a2cf5eefa00ee65e16443e47790.zip | |
Merge tag 'arc-4.6-rc4-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc
Pull ARC fixes from Vineet Gupta:
- fix Kconfig splat due to pcie rework
- make ethernet work again on axs103
- provide fb_pgprotect() for future video driver integration
* tag 'arc-4.6-rc4-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc:
ARC: [plat-axs103] Enable loop block devices
Revert "ARC: [plat-axs10x] add Ethernet PHY description in .dts"
arc: Add our own implementation of fb_pgprotect()
ARC: Don't source drivers/pci/pcie/Kconfig ourselves
Diffstat (limited to 'drivers/hid/wacom_sys.c')
0 files changed, 0 insertions, 0 deletions
