]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commitdiff
projects / mirror_ubuntu-disco-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d02bf06 66c500f)
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)
* '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


Trivial merge
Ubuntu Disco kernel mirror for Proxmox VE and PMG