From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 23 Dec 2010 03:47:04 +0000 (-0800)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6
X-Git-Tag: firefly_0821_release~7613^2~3190
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=ca5f73a05ebfbf74ea9874d5eaad8d63d7e69b4f;p=firefly-linux-kernel-4.4.55.git

Merge branch 'for-linus' of git://git./linux/kernel/git/sameo/mfd-2.6

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6:
  mfd: Support additional parent IDs for wm831x
  mfd: Fix ab8500-core interrupt ffs bit bug
  mfd: Supply IRQ base for WM832x devices
  watchdog: Fix null pointer dereference while accessing rdc321x platform_data
  gpio: Fix null pointer dereference while accessing rdc321x platform_data
---

ca5f73a05ebfbf74ea9874d5eaad8d63d7e69b4f