From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 28 May 2011 19:33:51 +0000 (-0700)
Subject: Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6
X-Git-Tag: v3.0-rc1~28
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=55f08e1baa3ef11c952b626dbc7ef9e3e8332a63;p=pandora-kernel.git

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

* 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6:
  mfd: Fix build breakage caused by tps65910 gpio directory move
  mfd: Use mfd cell platform_data for db8500-prcmu cells platform bits
---

55f08e1baa3ef11c952b626dbc7ef9e3e8332a63
Reading git-diff-tree failed