]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commit
Merge git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 24 Nov 2010 22:42:32 +0000 (07:42 +0900)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 24 Nov 2010 22:42:32 +0000 (07:42 +0900)
commitc12ae95ccc2dc80b4bd57363240cdb6eab2adcbc
treeaf3312bda2b0740278767867dadcf9c6223dc377
parent47143b094d4700842e42b0a7cc2548d7ae292690
parent3edabee2ed22ee4f98f4b4bb38a41059226a8446
Merge git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile

* git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile:
  arch/tile: fix memchr() not to dereference memory for zero length
  arch/tile: make glibc's sysconf(_SC_NPROCESSORS_CONF) work correctly
  arch/tile: fix rwlock so would-be write lockers don't block new readers