]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commitdiff
Merge branch 'davinci-fixes-for-linus-2' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 14 May 2010 18:43:52 +0000 (11:43 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 14 May 2010 18:43:52 +0000 (11:43 -0700)
* 'davinci-fixes-for-linus-2' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-davinci:
  DA830: fix USB 2.0 clock entry


Trivial merge