diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2011-06-30 01:23:59 -0400 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2011-06-30 01:23:59 -0400 |
| commit | 6da49a292534d31ca391928ea97f8225774dc1e0 (patch) | |
| tree | 060c5f5f40dceb10d4528763bc7fc1ccc88210d9 /Documentation/filesystems/proc.txt | |
| parent | 17bdc6c0e979ae61879806e4dd93ec3b169d0931 (diff) | |
| parent | ca56a95eedcc95f8fea7b49c87565cd961d74fe2 (diff) | |
Merge remote branch 'origin/master' into next
Diffstat (limited to 'Documentation/filesystems/proc.txt')
| -rw-r--r-- | Documentation/filesystems/proc.txt | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Documentation/filesystems/proc.txt b/Documentation/filesystems/proc.txt index f48178024067..db3b1aba32a3 100644 --- a/Documentation/filesystems/proc.txt +++ b/Documentation/filesystems/proc.txt | |||
| @@ -843,6 +843,7 @@ Provides counts of softirq handlers serviced since boot time, for each cpu. | |||
| 843 | TASKLET: 0 0 0 290 | 843 | TASKLET: 0 0 0 290 |
| 844 | SCHED: 27035 26983 26971 26746 | 844 | SCHED: 27035 26983 26971 26746 |
| 845 | HRTIMER: 0 0 0 0 | 845 | HRTIMER: 0 0 0 0 |
| 846 | RCU: 1678 1769 2178 2250 | ||
| 846 | 847 | ||
| 847 | 848 | ||
| 848 | 1.3 IDE devices in /proc/ide | 849 | 1.3 IDE devices in /proc/ide |