diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-17 20:54:12 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-17 20:54:12 -0700 |
| commit | bbe5a96f678efcad83de8f900ab4ab963a99c805 (patch) | |
| tree | d1e03c52bc7d16c1ac9f41503b27da2f4b6b781d /fs/proc/stat.c | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 (diff) | |
| parent | sparc: Update defconfigs. (diff) | |
| download | linux-dev-bbe5a96f678efcad83de8f900ab4ab963a99c805.tar.xz linux-dev-bbe5a96f678efcad83de8f900ab4ab963a99c805.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
sparc: Update defconfigs.
sparc: Kill PROM console driver.
Diffstat (limited to 'fs/proc/stat.c')
0 files changed, 0 insertions, 0 deletions