tree 990e2b21b93d0bc8b0d7170bf121f06ac60f919d
parent f8f5ed7c996ad9426847ce09b828d415cb19bc06
parent 6ac2afb3f4601d74778a6ef76c50813a5b85b133
author Linus Torvalds <torvalds@linux-foundation.org> 1321936565 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1321936565 -0800

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