diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-09 14:47:06 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-09 14:47:06 -0800 |
| commit | 37cfc3f67db9f2d907f6bfcfae590cdbbef623e8 (patch) | |
| tree | b573983938838dd76b40a7b53b3744472041720f /fs/jbd | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (diff) | |
| parent | sparc32: remove unused file: include/asm/pgtsun4.h (diff) | |
| download | linux-dev-37cfc3f67db9f2d907f6bfcfae590cdbbef623e8.tar.xz linux-dev-37cfc3f67db9f2d907f6bfcfae590cdbbef623e8.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next:
sparc32: remove unused file: include/asm/pgtsun4.h
sparc32: fix PAGE_SIZE definition
sparc32: enable different preemptions models
sparc32: support atomic64_t
apbuart: fix section mismatch warning
sparc32: drop useless preprocessor conditional in atomic_32.h
sparc32: drop unused atomic24 support
Diffstat (limited to 'fs/jbd')
0 files changed, 0 insertions, 0 deletions