From: Linus Torvalds 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-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=55f08e1baa3ef11c952b626dbc7ef9e3e8332a63;p=linux-beck.git Merge branch 'for-next' of git://git.kernel.org/pub/scm/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