projects / linux-flexiantxendom0-3.2.10.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (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)
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


Trivial merge
Port of xen3.3 xenlinux code to Ubuntu packaged SUSE kernel (3.2.10)