]> www.infradead.org Git - users/hch/dma-mapping.git/commitdiff
projects / users / hch / dma-mapping.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a74d70b f133ecc)
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)
* git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile:
  arch/tile: more /proc and /sys file support

1  2 
arch/tile/Kconfig patch | diff1 | diff2 | blob | history
fs/proc/base.c patch | diff1 | diff2 | blob | history

diff --cc arch/tile/Kconfig
Simple merge
diff --cc fs/proc/base.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.