projects / linux-flexiantxendom0-3.2.10.git / commit
summary | shortlog | log | commit | commitdiff | tree
(merge: 65e62b5 13176a8)
Merge tag 'mfd-for-linus-3.4-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 4 May 2012 00:21:05 +0000 (17:21 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 4 May 2012 00:21:05 +0000 (17:21 -0700)
commit0a6ba092d1c8c75ae0c0617ef7f4e6f5043af311
tree9a9afdaf58ab356aa457b6f5c8a2e80c85762901tree | snapshot
parent65e62b502bdaee37b6ea57edc3bb0df2ad1cb858commit | diff
parent13176a89e1c4a0011bd9f576730b0338ecb619ffcommit | diff
Merge tag 'mfd-for-linus-3.4-rc6' of git://git./linux/kernel/git/sameo/mfd-2.6

Pull second set of MFD fixes from Samuel Ortiz:
 "This time we only have a one liner fixing an omap-usb build error."

* tag 'mfd-for-linus-3.4-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6:
  mfd: Fix build breakage in omap-usb-host.c
Port of xen3.3 xenlinux code to Ubuntu packaged SUSE kernel (3.2.10)