Merge git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 29 May 2011 18:29:28 +0000 (11:29 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 29 May 2011 18:29:28 +0000 (11:29 -0700)
commit57ed609d4b64139b4d2cf5f3b4880a573a7905d2
treed824e1ebd33b28c4ccc53e9074064db479b17dc7
parenta74d70b63f1a0230831bcca3145d85ae016f9d4c
parentf133ecca9cbb31b5e6e9bda27cbe3034fbf656df
Merge git://git./linux/kernel/git/cmetcalf/linux-tile

* git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile:
  arch/tile: more /proc and /sys file support
arch/tile/Kconfig
fs/proc/base.c