diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-17 19:38:59 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-17 19:38:59 +0200 |
| commit | 2b04be7e8ab5756ea36e137dd03c8773d184e67e (patch) | |
| tree | c08e68a41b055bf9d7823ffd6f8843b72098f020 /fs/ubifs/journal.c | |
| parent | Merge branch 'tracing-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/... (diff) | |
| parent | x86: fix asm/e820.h for userspace inclusion (diff) | |
| download | linux-2b04be7e8ab5756ea36e137dd03c8773d184e67e.tar.xz linux-2b04be7e8ab5756ea36e137dd03c8773d184e67e.zip | |
Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
x86: fix asm/e820.h for userspace inclusion
x86: fix numaq_tsc_disable
x86: fix kernel_physical_mapping_init() for large x86 systems
Diffstat (limited to 'fs/ubifs/journal.c')
0 files changed, 0 insertions, 0 deletions