diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-24 04:07:02 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-24 04:07:02 +0300 |
| commit | 684baeb1d78ac478a8e5f00aa9ab0ce0837f2a91 (patch) | |
| tree | 47df6b59ab2f7d13516127726b99edc985bf4e12 /fs/squashfs/inode.c | |
| parent | 4e3ab74c22425e73a0c11dcc065c94c5c75ed2ad (diff) | |
| parent | fd0587339d80dd2fea5ead7f734676c9c618eace (diff) | |
| download | linux-684baeb1d78ac478a8e5f00aa9ab0ce0837f2a91.tar.bz2 | |
Merge branch 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull core kernel fixes from Ingo Molnar:
"Two small fixes"
* 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
Documentation: Reflect the new location of the NMI watchdog info
nohz: Fix idle ticks in cpu summary line of /proc/stat
Diffstat (limited to 'fs/squashfs/inode.c')
0 files changed, 0 insertions, 0 deletions