]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
projects / linux-2.6-omap-h63xx.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 30ef898 6c87df3)
Merge branch 'proc-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/adobriyan...
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 3 Nov 2008 17:59:01 +0000 (09:59 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 3 Nov 2008 17:59:01 +0000 (09:59 -0800)
* 'proc-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/adobriyan/proc:
  proc: revert /proc/uptime to ->read_proc hook


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.