]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commitdiff
Merge branch 'spi/merge' of git://git.secretlab.ca/git/linux-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 17 Feb 2011 00:48:36 +0000 (16:48 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 17 Feb 2011 00:48:36 +0000 (16:48 -0800)
* 'spi/merge' of git://git.secretlab.ca/git/linux-2.6:
  spi/pxa2xx pci: fix the release - remove race


Trivial merge