summaryrefslogtreecommitdiff
path: root/drivers/Makefile
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-05-28 23:33:51 +0400
committerLinus Torvalds <torvalds@linux-foundation.org>2011-05-28 23:33:51 +0400
commit55f08e1baa3ef11c952b626dbc7ef9e3e8332a63 (patch)
tree4eb5f0bf3fd8d26ead9bd92ed8c5214cecf348ea /drivers/Makefile
parentd02bf062fbb5e714d84ecefd05106062b9a45159 (diff)
parent66c500ff36d74c6669ad260deda4ce8125b55304 (diff)
downloadlinux-55f08e1baa3ef11c952b626dbc7ef9e3e8332a63.tar.xz
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
Diffstat (limited to 'drivers/Makefile')
0 files changed, 0 insertions, 0 deletions