From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 22 Nov 2011 04:36:05 +0000 (-0800)
Subject: Merge branch 'char-misc-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregk... 
X-Git-Tag: v3.2-rc3~20
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?p=pandora-kernel.git;a=commitdiff_plain;h=b0d81664a0092d8f6df7742b5aee6fcfd326b36c

Merge branch 'char-misc-linus' of git://git./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
---

b0d81664a0092d8f6df7742b5aee6fcfd326b36c