diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-12 17:21:19 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-12 17:21:19 -0400 |
| commit | 8d86e5f91440aa56a5df516bf58fe3883552ad56 (patch) | |
| tree | 94c8aea597b9e1ade376743a3f8f830e5195fa57 /kernel/watchdog.c | |
| parent | d93a881dd7d71ad0e6504af232be2795044ab686 (diff) | |
| parent | 770e1ac5f29003fca18af4e67eb5a05ddb5b1491 (diff) | |
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:
powerpc/mm: Fix memory_block_size_bytes() for non-pseries
mm: Move definition of MIN_MEMORY_BLOCK_SIZE to a header
Diffstat (limited to 'kernel/watchdog.c')
0 files changed, 0 insertions, 0 deletions