Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 28 May 2011 19:33:51 +0000 (12:33 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 28 May 2011 19:33:51 +0000 (12:33 -0700)
commit55f08e1baa3ef11c952b626dbc7ef9e3e8332a63
tree4eb5f0bf3fd8d26ead9bd92ed8c5214cecf348ea
parentd02bf062fbb5e714d84ecefd05106062b9a45159
parent66c500ff36d74c6669ad260deda4ce8125b55304
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